Merge branch '2843_search_hotkey_conflict' into 4.8.1-stable
commit62901bbce16a5c6c1e930937bdf5ccd54dfca0d7
authorAndrew Borodin <aborodin@vmail.ru>
Tue, 10 Jul 2012 17:01:29 +0000 (10 21:01 +0400)
committerAndrew Borodin <aborodin@vmail.ru>
Tue, 10 Jul 2012 17:01:29 +0000 (10 21:01 +0400)
treeb5200bbdaaa787a608700e65a48ad37192af33d6
parent5891a288c463dbe79ca5cc1a52a173a486cc0ba5
parentad1f1b56e7f135801ae31ee1810546ec6efd71ac
Merge branch '2843_search_hotkey_conflict' into 4.8.1-stable

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