Merge branch '2843_search_hotkey_conflict'
commit54b2b2fe67823af58dc630e4d587b8e168874933
authorAndrew Borodin <aborodin@vmail.ru>
Tue, 10 Jul 2012 16:59:21 +0000 (10 20:59 +0400)
committerAndrew Borodin <aborodin@vmail.ru>
Tue, 10 Jul 2012 16:59:21 +0000 (10 20:59 +0400)
tree11b5a066c58ac5c6eaed7da861699de07329be56
parent04bce06ce45cacbeb69b963024293b2d82de6339
parent562ef41b15375c480c8f3fd2923ddd45635de0b2
Merge branch '2843_search_hotkey_conflict'

* 2843_search_hotkey_conflict:
  Ticket #2842: change hotkey for Normal search mode.