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

[Christof Damian]

commit 216beac7ca70dedc0e279087175784ff5229e69f
Merge: 7592891 1f88922
Author: Christof Damian <christof at damian.net>
Date:   Sat Sep 8 21:07:32 2012 +0200

    Merge branch 'master' into f18

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