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

[Christof Damian]

commit f742d507fb00a884d978a078d4d272753077afc3
Merge: 45412b0 37426d4
Author: Christof Damian <christof at damian.net>
Date:   Fri Oct 12 14:18:22 2012 +0200

    Merge branch 'master' into f16

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