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

[Christof Damian]

commit 8384f77c1ce970842e8f8328855ed902aebf59f6
Merge: 52812b1 1f88922
Author: Christof Damian <christof at damian.net>
Date:   Sat Sep 8 22:55:13 2012 +0200

    Merge branch 'master' into f17

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