[dbmail: 14/15] Merge remote branch 'origin/f13/master'

[Bernard Johnson]

commit e98cb6efc1dfec3a3675cafd5fec54f169a62019
Merge: 7b7349e 44add9d
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Sun Sep 12 15:19:18 2010 -0600

    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore
    	dbmail.spec
    	sources

 .gitignore                                   |    2 -
 dbmail-2.2.16-backport-IMAP-ID.patch         |  113 +++++++++++++
 dbmail-2.2.16-imap-append-speedup.patch      |  217 ++++++++++++++++++++++++++
 dbmail-2.2.16-inverse-pop3-list.patch        |   25 +++
 dbmail-2.2.16-spurious-imap-whitespace.patch |   33 ++++
 dbmail-2.2.16-update-asciidocs.patch         |   57 +++++++
 dbmail.spec                                  |    2 +
 sources                                      |    4 +
 8 files changed, 451 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 736e5df,4d2e569..bfb6d50
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,2 +1,1 @@@
--dbmail-2.2.15.tar.bz2
--dbmail-2.2.16.tar.bz2
 +/dbmail-2.2.17.tar.bz2
diff --cc sources
index 1f3c40e,c3e2cc2..c72b104
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +50c41ecae16f1789627a1255ce83e135  dbmail-2.2.17.tar.bz2
++=======
+ 53a85a2b47d544988e2f9bc17b173f2e  dbmail-2.2.16.tar.bz2
++>>>>>>> origin/f13/master