Commit [3852c6]  Maximize  Restore  History

Merge branch 'muc-vcard-get' into upstream

* muc-vcard-get:
Rearrange MUC menu to maintain hotkeys (thanks to catap)

Evgenii Terechkov Evgenii Terechkov 2010-01-09