typo
Fix filtering out smartlists when not restricting to user owned shares.

Simplify a bit as well.
BFN
Merge branch 'master' into develop

Conflicts:
	nag/lib/Nag.php
	nag/package.xml
[jan] Use ssh2_sftp_chmod() if available (ssh2 0.12).
Merge branch 'master' into develop

Conflicts:
	framework/Vfs/package.xml
Update/fix package.xml from merge
Merge branch 'master' into develop
Readd MyTopo support to develop.
The hash needs to be uppercase for MyTopo to validate it.
Merge branch 'master' into develop
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