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

[Christof Damian]

commit 2d2c249da44bc275fadb9fdb7a3f10f4a207d78d
Merge: 3788bb9 470d2cd
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 3 00:38:56 2012 +0100

    Merge branch 'master' into f17

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