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

[Christof Damian]

commit 13607e7d5b32609d8f5d41001527d8eff31a2ec8
Merge: 35f8132 a4136bb
Author: Christof Damian <christof at damian.net>
Date:   Sat May 19 18:03:06 2012 +0200

    Merge branch 'master' into f16

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