6.1 version
[mms] Importing a PGP personal key now only requires the private key.
[mms] Add Horde_Crypt_Pgp#getPublicKeyFromPrivateKey().
Move this method to Horde_Crypt_Pgp, where it belongs.
Merge branch 'master' into imp_6_1

Conflicts:
	imp/package.xml
[mms] Collapse multiple mailbox export options in dynamic mailbox view to single action.
Remove subfolder searching option

Adds complexity to menu for very little gain - it is trivial to select
this option on the search page itself, which a user will need to alter
anyway since they need to enter search terms
Remove unnecessary comments (is just duplication of description)
Merge branch 'master' into imp_6_1

Conflicts:
	imp/config/prefs.php
	imp/package.xml
[mms] Use new Horde_Imap_Client sync features to synchronize browser data in dynamic mailbox page.
Merge branch 'master' into imp_6_1

Conflicts:
	imp/package.xml
Merge branch 'imap-client_2_2' into imp_6_1
[mms] Better UI for changing quicksearch criteria in dynamic mailbox screen.
[mms] Add message thread view to dynamic mailbox preview.
Merge branch 'thread' into imp_6_1

Conflicts:
	imp/package.xml
Remove unneded preferences comments
horde no longer requires Horde_Template
Forgot to add this file
Add collapsible formatting to smartmobile portal page
Convert scripts to Horde_Argv