From 8a80f2c2b6c4ba29d0a8de2ab1514a991b109c7c Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <andreas.bierfert@lowlatency.de>
Date: Mar 20 2011 09:13:01 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/libetpan


Conflicts:
	libetpan.spec

---

diff --git a/libetpan.spec b/libetpan.spec
index 5bac4fb..a532869 100644
--- a/libetpan.spec
+++ b/libetpan.spec
@@ -90,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 - 1.0.1-0.1.20110312cvs
 - upgrade to cvs to fix imap/gmail issues
 
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@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