[dbmail: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/dbmail

[Bernard Johnson]

commit 21e6851f10876e956873f20b3fd34faeeddc746d
Merge: 50d344d 6a8cb60
Author: Bernard Johnson <bjohnson at symetrix.com>
Date:   Mon Feb 21 22:27:55 2011 -0700

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/dbmail
    
    Conflicts:
    	dbmail.spec

 dbmail.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc dbmail.spec
index 437d749,d87107a..6b42908
--- a/dbmail.spec
+++ b/dbmail.spec
@@@ -2,7 -2,7 +2,7 @@@
  
  Name:           dbmail
  Version:        3.0.0
--Release:        0.3.rc1%{?dist}
++Release:        0.4.rc1%{?dist}
  Summary:        A database backed mail storage system
  
  Group:          System Environment/Daemons
@@@ -194,10 -194,10 +194,13 @@@ dbmail
  
  
  %changelog
- * Mon Feb 21 2011 Bernard Johnson <bjohnson at symetrix.com> - 3.0.0-0.3.rc1
++* Mon Feb 21 2011 Bernard Johnson <bjohnson at symetrix.com> - 3.0.0-0.4.rc1
 +- try rebuild against libevent ABI v2
 +
- * Sat Jan 22 2011 Bernard Johnson <bjohnson at symetrix.com> - 3.0.0-0.2.rc1
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.0-0.3.rc1
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
+ * Sat Jan 22 2011 Bernard Johnson <bjohnson at symetrix.com> - 3.0.0.0.2.rc1
  - patch to glib package config flags for el6
  
  * Sat Jan 15 2011 Bernard Johnson <bjohnson at symetrix.com> - 3.0.0-0.1.rc1