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

[Christof Damian]

commit 255d7aaa381505fde04e5444e319facb8bef4359
Merge: 8eaed41 b0c7d0b
Author: Christof Damian <christof at damian.net>
Date:   Fri Apr 19 20:18:00 2013 +0200

    Merge branch 'master' into f18

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