[php-phpunit-PHP-TokenStream/f18: 3/3] Merge branch 'master' into f18

[Christof Damian]

commit 77c1ff44d799217e670b8fef517129ab4609dea9
Merge: 15afff7 37426d4
Author: Christof Damian <christof at damian.net>
Date:   Fri Oct 12 13:25:25 2012 +0200

    Merge branch 'master' into f18

 .gitignore                       |    1 +
 php-phpunit-PHP-TokenStream.spec |   10 ++++++----
 sources                          |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---