[php-phpunit-File-Iterator/f17: 3/3] Merge branch 'master' into f17

[Christof Damian]

commit f685a13a325583d4762d5d801a2ca7dd27dea315
Merge: 798e019 59f5f1e
Author: Christof Damian <christof at damian.net>
Date:   Sun Sep 23 19:43:59 2012 +0200

    Merge branch 'master' into f17

 .gitignore                     |    1 +
 php-phpunit-File-Iterator.spec |    8 +++++++-
 sources                        |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---