[php-pecl-igbinary: 2/2] fix merge

[Remi Collet]

commit 275474036cce6094b7678e59682f284a9c32c885
Merge: 874a526 87b1ba0
Author: remi <fedora at famillecollet.com>
Date:   Fri Jan 20 18:44:55 2012 +0100

    fix merge

 php-pecl-igbinary.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc php-pecl-igbinary.spec
index f47624e,929d1bf..31a8993
--- a/php-pecl-igbinary.spec
+++ b/php-pecl-igbinary.spec
@@@ -185,9 -156,9 +185,12 @@@ f
  
  
  %changelog
 +* Mon Dec 05 2011 Remi Collet <remi at fedoraproject.org> - 1.1.2-0.1.git3b8ab7e
 +- update to git snapshot for php 5.4
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Sun Sep 18 2011 Remi Collet <rpms at famillecollet.com> 1.1.1-3
  - fix EPEL-6 build, no arch version for php-devel