[php-phpunit-phpdcd/f17: 2/2] Merge branch 'master' into f17

[Christof Damian]

commit d85cb036edb7c6b8f8e83e4bfb68c0d027b32545
Merge: e75723a 3cedd8c
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 24 15:16:29 2012 +0100

    Merge branch 'master' into f17

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