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

[Christof Damian]

commit 88b36f98ecf458a578241e1f0db9f703d3f6af87
Merge: 24f175e e226460
Author: Christof Damian <christof at damian.net>
Date:   Sat Jan 12 16:57:05 2013 +0100

    Merge branch 'master' into f18

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