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

[Christof Damian]

commit d89868f61451d7d097cf5724abc315b0386dec6c
Merge: 0d1cbe6 18b1174
Author: Christof Damian <christof at damian.net>
Date:   Fri Sep 17 18:58:48 2010 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	php-phpunit-File-Iterator.spec
    	sources

 .gitignore                     |    2 +-
 php-phpunit-File-Iterator.spec |    7 +++++--
 sources                        |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 0bba37e,386453d..4686c2f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--File_Iterator-1.2.2.tgz
+ /File_Iterator-1.2.3.tgz