From 94b5b59949dcd6546382bc9bdc3f1010801f94d3 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Feb 10 2013 22:15:12 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/zarafa


Conflicts:
	zarafa.spec

---

diff --git a/zarafa.spec b/zarafa.spec
index 597e517..72dc4d1 100644
--- a/zarafa.spec
+++ b/zarafa.spec
@@ -877,7 +877,7 @@ fi
 * Sun Feb 10 2013 Robert Scheck <robert@fedoraproject.org> 7.0.12-1
 - Upgrade to 7.0.12
 
-* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 7.0.9-2
+* Sun Feb 10 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 7.0.9-3
 - Rebuild for Boost-1.53.0
 
 * Fri Feb 01 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 7.0.9-2