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

[Christof Damian]

commit bbaa798d94a4f594e3aca56173a6b1a5c6869eea
Merge: ed116e4 b0c7d0b
Author: Christof Damian <christof at damian.net>
Date:   Fri Apr 19 20:03:52 2013 +0200

    Merge branch 'master' into f19

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