[php-phpunit-PHP-Timer/f18: 2/2] Merge branch 'master' into f18

[Christof Damian]

commit 97b2fc74832748575d5d028d1817355eba6bf009
Merge: bda10fe 2844650
Author: Christof Damian <christof at damian.net>
Date:   Fri Oct 12 10:35:14 2012 +0200

    Merge branch 'master' into f18

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