This needs to be 2.6.0, since 2.5.0 has already been released
[mms] Workaround QRESYNC errata that allows FETCH FLAGS results to be returned without UID information.
Need to catch Horde_Exception_NotFound also
DTEND is non-inclusive.
[mms] Fix regression in parsing LISTRIGHTS results (Bug #11994).
More robust/complete IMAP response syntax checking
Merge branch 'master' into imp_6_1

Conflicts:
	imp/docs/CHANGES
	imp/package.xml
Add missing mapping for manager name. Add support for phonetic names.

Bug: 11995
Signed-off-by: Michael J Rubinsky <mrubinsk@horde.org>
No way in hell we can recommend Courier anymore. It is simply not good software
Although in general, it is hard to recommend anything other than Cyrus/Dovecot to give reasonable performance

And no reason to give ANY sort of mention of installing a POP3 server.
Bug #11998: Fix occasionally disappearing statusbar
[mms] Horde_Prefs_Identity#getDefaultFromAddress() now returns a Horde_Mail_Rfc822_Address object.
Not needed - this is already done for us in Horde_Core_Factory_Identity

Bug #11997
Bug #11997: Catch mail sending exception when downloading linked attachment
Move paste plugin -> pasteignore
Merge branch 'master' into imp_6_1