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

[Christof Damian]

commit a1739d8fa6eba6a07427c3ee695c7a5645f8a7d9
Merge: 88460d2 a4136bb
Author: Christof Damian <christof at damian.net>
Date:   Sat May 19 18:16:15 2012 +0200

    Merge branch 'master' into el6

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