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

[Christof Damian]

commit 6bd596f1436ee300feaa4df5e52e64d03405194f
Merge: 27f3007 184a1cb
Author: Christof Damian <christof at damian.net>
Date:   Sun Nov 3 16:01:29 2013 +0100

    Merge branch 'master' into f20

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