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

[Christof Damian]

commit 88460d2afe3eaebf3fdf060d2e3dc65635c4d312
Merge: f48141e 470d2cd
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 3 13:36:39 2012 +0100

    Merge branch 'master' into el6

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