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

[Bernard Johnson]

commit 7e85d6aa3fb5b1c057ef9442106dc0e8a4e62cbb
Merge: e98cb6e 2b0f034
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Sun Sep 12 15:25:21 2010 -0600

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

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --cc sources
index c72b104,c3e2cc2..1f3c40e
--- a/sources
+++ b/sources
@@@ -1,5 -1,1 +1,1 @@@
- <<<<<<< HEAD
 -53a85a2b47d544988e2f9bc17b173f2e  dbmail-2.2.16.tar.bz2
 +50c41ecae16f1789627a1255ce83e135  dbmail-2.2.17.tar.bz2
- =======
- 53a85a2b47d544988e2f9bc17b173f2e  dbmail-2.2.16.tar.bz2
- >>>>>>> origin/f13/master