Merge branch '1724_missmatched_macro_hotkeys'
commit00b94eec5dd931e09c455839f2910c63ed23238f
authorIlia Maslakov <il.smind@gmail.com>
Fri, 25 Dec 2009 12:11:41 +0000 (25 15:11 +0300)
committerIlia Maslakov <il.smind@gmail.com>
Fri, 25 Dec 2009 12:11:41 +0000 (25 15:11 +0300)
tree9f288553ccbf0b23d170c7503309d2f929439812
parentdedb6a9a44fad79d08783671ee0583842a1d61a0
parentb03b234085c766830328253a743fcda8ae79a1e2
Merge branch '1724_missmatched_macro_hotkeys'

* 1724_missmatched_macro_hotkeys:
  Ticket #1724 (mismatched hotkeys)