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

[Christof Damian]

commit 2680ec8fbb6e91529f97628e4990d50471c0a3d0
Merge: 639ef12 9998698
Author: Christof Damian <christof at damian.net>
Date:   Fri Oct 12 12:03:48 2012 +0200

    Merge branch 'master' into f18

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