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

[Christof Damian]

commit 6004ee58a670d9964addb7d37f4444e6c4eb545f
Merge: f6f6ca3 ed116e4
Author: Christof Damian <christof at damian.net>
Date:   Mon Feb 25 02:45:12 2013 +0100

    Merge branch 'master' into el6

 .gitignore                    |    2 ++
 php-pear-PHP-CodeSniffer.spec |   24 +++++++++++++++---------
 sources                       |    2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)
---