From db67689fb899d247191c3ec1f9a0c07967887c3e Mon Sep 17 00:00:00 2001
From: John Khvatov <ivaxer@sgu.ru>
Date: Nov 06 2011 22:45:42 +0000
Subject: fixed merge conflict


---

diff --git a/opensips.spec b/opensips.spec
index fe61e7c..b684c4b 100644
--- a/opensips.spec
+++ b/opensips.spec
@@ -1046,6 +1046,9 @@ fi
 - added new modules: event_datagram and python
 - removed lcr module
 
+* Sat Sep 17 2011  Remi Collet <remi@fedoraproject.org> - 1.6.4-13
+- rebuild against libmemcached.so.8
+
 * Mon Aug 22 2011 John Khvatov <ivaxer@fedoraproject.org> - 1.6.4-12
 - rebuild against new libnetsnmp