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

[Christof Damian]

commit bf2d9b24ad8c2a7fb70a29297168ce3ea10402e2
Merge: a1739d8 65088ef
Author: Christof Damian <christof at damian.net>
Date:   Fri Jul 13 21:07:46 2012 +0200

    Merge branch 'master' into el6

 .gitignore                    |    1 +
 php-pear-PHP-CodeSniffer.spec |    5 ++++-
 sources                       |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---