[php-phpunit-PHP-TokenStream/f19: 2/2] Merge branch 'master' into f19

[Christof Damian]

commit e12b77896d2472b546e44c291f08b04f5aa33b64
Merge: df75dea d969e04
Author: Christof Damian <christof at damian.net>
Date:   Tue Jul 30 12:40:45 2013 +0200

    Merge branch 'master' into f19

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