[php-phpunit-PHP-CodeBrowser: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-phpunit-PHP-CodeBrowser

[Christof Damian]

commit e9ab5ab9cafdabae88e26182a790068b648893f2
Merge: d367ea0 6087bef
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 3 14:22:48 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-phpunit-PHP-CodeBrowser
    
    Conflicts:
    	php-phpunit-PHP-CodeBrowser.spec

 php-phpunit-PHP-CodeBrowser.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc php-phpunit-PHP-CodeBrowser.spec
index b75eb6e,6eb7ce3..a189a6a
--- a/php-phpunit-PHP-CodeBrowser.spec
+++ b/php-phpunit-PHP-CodeBrowser.spec
@@@ -89,10 -94,9 +89,13 @@@ f
  
  
  %changelog
 +* Sat Mar  3 2012 Christof Damian <christof at damian.net> - 1.0.2-1
 +- upstream 1.0.2
 +- moved docdir
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Wed Nov  2 2011 Christof Damian <christof at damian.net> - 1.0.1-1
  - upstream 1.0.1