[php-phpunit-DbUnit: 2/2] fix merge

[Remi Collet]

commit 004b975207ef09954ab26b4ae94431f05dbea0a2
Merge: f4577a3 be88892
Author: remi <fedora at famillecollet.com>
Date:   Fri Jan 27 18:49:55 2012 +0100

    fix merge

 php-phpunit-DbUnit.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc php-phpunit-DbUnit.spec
index bd57d4c,94eda2a..49706ad
--- a/php-phpunit-DbUnit.spec
+++ b/php-phpunit-DbUnit.spec
@@@ -78,9 -78,9 +78,12 @@@ f
  
  
  %changelog
 +* Fri Jan 27 2012 Remi Collet <remi at fedoraproject.org> - 1.1.2-1
 +- Version 1.1.2 (stable) - API 1.1.0 (stable)
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Fri Nov 11 2011 Remi Collet <remi at fedoraproject.org> - 1.1.1-1
  - Version 1.1.1 (stable) - API 1.1.0 (stable)