[php-phpunit-PHP-CodeBrowser/f17: 3/3] Merge branch 'master' into f17

[Christof Damian]

commit d97109a2ce530b76b40d13c8fda0278bf53b1ca2
Merge: 6087bef e9ab5ab
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 3 14:32:28 2012 +0100

    Merge branch 'master' into f17

 .gitignore                       |    1 +
 php-phpunit-PHP-CodeBrowser.spec |   15 +++++++--------
 sources                          |    2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
---