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

[Christof Damian]

commit 9bc390f7cc3e211fe7531f66f4437204cbee8203
Merge: 62ef05b 9998698
Author: Christof Damian <christof at damian.net>
Date:   Fri Oct 12 12:26:41 2012 +0200

    Merge branch 'master' into f16

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