[php-phpunit-PHP-CodeBrowser/f16: 4/4] Merge branch 'master' into f16

[Christof Damian]

commit 534b819ebb381f614312870272c1b817f0b2d002
Merge: 428a840 e9ab5ab
Author: Christof Damian <christof at damian.net>
Date:   Sat Mar 3 14:45:52 2012 +0100

    Merge branch 'master' into f16

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