[php-phpunit-File-Iterator/f18: 2/2] Merge branch 'master' into f18

[Christof Damian]

commit 639ef123cf163dd53c6d346517a99e12d6231e58
Merge: 6aaecd8 59f5f1e
Author: Christof Damian <christof at damian.net>
Date:   Sun Sep 23 16:39:05 2012 +0200

    Merge branch 'master' into f18

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