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

[Christof Damian]

commit ac159aea2ce0ef06317b796a6203f49178e695cb
Merge: bf2d9b2 1f88922
Author: Christof Damian <christof at damian.net>
Date:   Sun Sep 9 00:43:54 2012 +0200

    Merge branch 'master' into el6

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