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

[Christof Damian]

commit 52812b1eba2d9ff984e893943439232eccab9abf
Merge: cbe3cc2 65088ef
Author: Christof Damian <christof at damian.net>
Date:   Fri Jul 13 20:44:04 2012 +0200

    Merge branch 'master' into f17

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