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

[Christof Damian]

commit 470d2cd04cf3a150b625c71fbbc084514075dcbb
Merge: d1161aa 3788bb9
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 3 00:31:32 2012 +0100

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

 php-pear-PHP-CodeSniffer.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc php-pear-PHP-CodeSniffer.spec
index 37f752a,7f6e214..17be5c7
--- a/php-pear-PHP-CodeSniffer.spec
+++ b/php-pear-PHP-CodeSniffer.spec
@@@ -95,9 -95,9 +95,12 @@@ f
  %{_bindir}/phpcs
  
  %changelog
 +* Fri Mar  2 2012 Christof Damian <christof at damian.net> - 1.3.3-1
 +- upstream 1.3.3
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Thu Nov  3 2011 Christof Damian <christof at damian.net> - 1.3.1-1
  - upstream 1.3.1