Merge branch 'keymaps'
authorSebastian Pipping <sebastian@pipping.org>
Mon, 9 Apr 2012 02:43:50 +0000 (04:43 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Mon, 9 Apr 2012 02:43:56 +0000 (04:43 +0200)
commit72d3994e6af669d54edc716971dea335acb20c93
tree8ee7db32f0f3085d9d8870f8480413670445d9c6
parent31a4d5f2e1d1d43fb8e39fa0447f6e162759b4d2
parentb828136a1a79a57380d897607637aafc5db4dbf8
Merge branch 'keymaps'

Acked-by: Rick Farina <sidhayn@gmail.com>