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

[Remi Collet]

commit 5aa4665c04ede83c8ed7610c37f81aa21b9ac82f
Merge: d993f2d 22e96c4
Author: remi <fedora at famillecollet.com>
Date:   Fri Jan 20 19:22:39 2012 +0100

    fix merge

 php-pecl-xdebug.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc php-pecl-xdebug.spec
index 7da407b,a36730f..6e5d90a
--- a/php-pecl-xdebug.spec
+++ b/php-pecl-xdebug.spec
@@@ -173,9 -154,9 +173,12 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 +* Sun Nov 13 2011 Remi Collet <remi at fedoraproject.org> - 2.2.0-0.1.gitd076740
 +- update to 2.2.0-dev, build against php 5.4
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.2-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Thu Jul 28 2011 Remi Collet <Fedora at FamilleCollet.com> - 2.1.2-1
  - update to 2.1.2
  - fix provides filter for rpm 4.9