[dbmail/el6/master: 28/28] Merge branch 'master' into el6

[Bernard Johnson]

commit 5ab0d8a65ced9c81b197ea48f850e9d2532b8f47
Merge: a8fba6d 0d2fd36
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Sat Jan 15 16:41:21 2011 -0700

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	dbmail.spec
    	sources

 .gitignore                               |    2 +-
 README.fedora                            |   14 +--
 dbmail-3.0.0-fix-deprecated-gmime.patch  |   12 ++
 dbmail-3.0.0-xmlto-skip-validation.patch |   22 ++++
 dbmail.cron                              |    7 +-
 dbmail.spec                              |  163 +++++++++++-------------------
 dbmail.sysconfig                         |    2 +
 sources                                  |    2 +-
 8 files changed, 103 insertions(+), 121 deletions(-)
---
diff --cc .gitignore
index c9b4ee9,a9c99f8..4a52202
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- dbmail-2.2.15.tar.bz2
 -/dbmail-2.2.17.tar.bz2
+ /dbmail-3.0.0-rc1.tar.gz