[php-phpunit-phpdcd/el6: 6/6] Merge branch 'master' into el6

[Christof Damian]

commit 822d03dcdebf364ef88fa9408afbf281e95dbc50
Merge: 0ffa430 3cedd8c
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 24 15:40:50 2012 +0100

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

 .gitignore              |    4 ++++
 php-phpunit-phpdcd.spec |   20 +++++++++++++++-----
 sources                 |    2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 63d695c,3ea38df..f14a0ee
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,5 @@@
  phpdcd-0.9.2.tgz
++<<<<<<< HEAD
++=======
+ /phpdcd-0.9.3.tgz
++>>>>>>> master