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

[Christof Damian]

commit 37426d4a4940d2642a86a350ace66a821db49156
Merge: d02ecff 15afff7
Author: Christof Damian <christof at damian.net>
Date:   Fri Oct 12 12:58:15 2012 +0200

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

 php-phpunit-PHP-TokenStream.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc php-phpunit-PHP-TokenStream.spec
index de46433,6782b3b..5957905
--- a/php-phpunit-PHP-TokenStream.spec
+++ b/php-phpunit-PHP-TokenStream.spec
@@@ -80,9 -81,9 +80,12 @@@ f
  %doc %{pear_docdir}/%{pear_name}
  
  %changelog
 +* Fri Oct 12 2012 Christof Damian <christof at damian.net> - 1.1.5-1
 +- upstream 1.1.5
 +
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Fri Mar  2 2012 Christof Damian <christof at damian.net> - 1.1.3-1
  - upstream 1.1.3