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

[Christof Damian]

commit 8887674e4d46e6b23fc9f77c24be7a13546f4dcf
Merge: f510120 2844650
Author: Christof Damian <christof at damian.net>
Date:   Fri Oct 12 10:49:20 2012 +0200

    Merge branch 'master' into f17

 .gitignore                 |    1 +
 php-phpunit-PHP-Timer.spec |   12 +++++++++---
 sources                    |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---