[php-phpunit-File-Iterator/el6: 4/4] fix merge

Tue Jan 17 16:45:17 UTC 2012

commit 93ce2c3442e985e26e4e28841dfcdd6ceba2c695
Merge: 97dfcca 798e019
Author: remi <fedora at famillecollet.com>
Date:   Tue Jan 17 17:44:44 2012 +0100

    fix merge

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