[php-pear-phing: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-pear-phing

[Christof Damian]

commit a0eaa6270620ce49dee4cc65b9e4fd135aa0d16f
Merge: 4ae12df bbed056
Author: Christof Damian <christof at damian.net>
Date:   Fri Mar 2 21:15:57 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-pear-phing
    
    Conflicts:
    	php-pear-phing.spec

 php-pear-phing.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc php-pear-phing.spec
index 7f75b96,ef4b9ca..8f1878d
--- a/php-pear-phing.spec
+++ b/php-pear-phing.spec
@@@ -88,9 -88,9 +88,12 @@@ f
  
  
  %changelog
 +* Fri Mar  2 2012 Christof Damian <christof at damian.net> - 2.4.9-1
 +- upstream 2.4.9
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.8-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Fri Nov  4 2011 Christof Damian <christof at damian.net> - 2.4.8-2
  - remove (optional) phpunit requirement