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

[Christof Damian]

commit afacb0aabb07f9e36e7b34bdb0468d00d74a06ef
Merge: 8384f77 3f7162b
Author: Christof Damian <christof at damian.net>
Date:   Fri Oct 12 15:34:12 2012 +0200

    Merge branch 'master' into f17

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