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

[Christof Damian]

commit b64c0630151bbfb9dc2f78b84dbafe98fd9cd7a2
Merge: 0ae74b5 45412b0
Author: Christof Damian <christof at damian.net>
Date:   Fri Mar 2 20:35:38 2012 +0100

    Merge branch 'master' into el6

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