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

[Andreas Bierfert]

commit 8a80f2c2b6c4ba29d0a8de2ab1514a991b109c7c
Merge: f3be052 e9e9149
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Sun Mar 20 10:13:01 2011 +0100

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

 libetpan.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc libetpan.spec
index 5bac4fb,36cf43e..a532869
--- a/libetpan.spec
+++ b/libetpan.spec
@@@ -86,10 -72,9 +86,13 @@@ rm -rf $RPM_BUILD_ROO
  %{_libdir}/*.so
  
  %changelog
 +* Sat Mar 12 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 +- 1.0.1-0.1.20110312cvs
 +- upgrade to cvs to fix imap/gmail issues
 +
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Tue May 11 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
  - 1.0-1
  - version upgrade