[php-pear-PHP-CodeSniffer/el6: 11/11] Merge branch 'master' into el6

[Christof Damian]

commit f48141ec375f4e436e37e29771d17f0fcc83bcd9
Merge: 448c1f3 1b9417e
Author: Christof Damian <christof at damian.net>
Date:   Thu Nov 3 22:49:55 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	php-pear-PHP-CodeSniffer.spec
    	sources

 .gitignore                    |    6 +++-
 php-pear-PHP-CodeSniffer.spec |   48 +++++++++++++++++++++++++++++++++-------
 sources                       |    3 +-
 3 files changed, 44 insertions(+), 13 deletions(-)
---