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

[Christof Damian]

commit 80296cd38552bb855b1c5cd7113dd51a4b117b3c
Merge: f685a13 9998698
Author: Christof Damian <christof at damian.net>
Date:   Fri Oct 12 12:14:53 2012 +0200

    Merge branch 'master' into f17

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