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

[Christof Damian]

commit 15e96c76a5d65a2b1cff506061641b488bcecb27
Merge: 4a02dd1 1f88922
Author: Christof Damian <christof at damian.net>
Date:   Sun Sep 9 00:32:13 2012 +0200

    Merge branch 'master' into f16

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