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

Merged and Committed by Christof Damian 12 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-pear-PHP-CodeSniffer
    
    Conflicts:
    	php-pear-PHP-CodeSniffer.spec