[php-phpunit-File-Iterator/f13/master: 6/7] Merge branch 'master' into f13

[Christof Damian]

commit 54d6926d5302960b936871576a50ce02a3cbd401
Merge: 83e74d0 18b1174
Author: Christof Damian <christof at damian.net>
Date:   Fri Sep 17 18:47:29 2010 +0200

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

 .gitignore                     |    2 +-
 php-phpunit-File-Iterator.spec |    7 +++++--
 sources                        |    4 ++++
 3 files changed, 10 insertions(+), 3 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
diff --cc sources
index 492b59d,9be5e06..8b0bbc6
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +3a0594013f62747794a54b468902f01e  File_Iterator-1.2.2.tgz
++=======
+ 8658ddc33b4996aba71234c49efcc927  File_Iterator-1.2.3.tgz
++>>>>>>> master