User-Agent header is not required when SETTINGS command is used.

Add temporary value until the SETTINGS command populates it.
Bug: 12154
Work around broken HTC clients that send -1 in place of empty tags.

Bug: 12155
BFN
Fix assumption that memcache is available for tests
This needs both the public and private key
Revocation w/passphrases doesn't work in GPG2 due to the way pinentry works
Not sure how this ever worked: mail messages absolutely must have a from address
Yikes. phpunit silently dying because exif isn't available. Another reason why '@' function prefixes are bad
Fix broken tests

Test was not correctly/inconsistently calling constructor.
[mms] Fix Horde_Crypt_Pgp#encryptedSymmetrically() rom entering an infinite loop when using GnuPg v2.
I don't pretend to know why these ampersands are there, but adding the missing initial one fixes things for me

All tests now pass fo me on my local machine.
Don't mangle the username if we are trying to strip the email.
Merge branch 'master' into imp_6_1