[php-pear-PHP-CodeSniffer/f16: 4/4] Merge branch 'master' into f16

[Christof Damian]

commit 35f8132ba7908acbb157fc7285d88f8bc32eec6a
Merge: 1b9417e 470d2cd
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 3 13:26:17 2012 +0100

    Merge branch 'master' into f16

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