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

[Christof Damian]

commit bc7b2eb6d8704e234d458585bd6dfeb7ceeda209
Merge: 195a7bc 9998698
Author: Christof Damian <christof at damian.net>
Date:   Fri Oct 12 12:37:12 2012 +0200

    Merge branch 'master' into el6

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