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

[Christof Damian]

commit a49fe520cdaed14c3f6656860df448f49e7d2cb2
Merge: b64c063 37426d4
Author: Christof Damian <christof at damian.net>
Date:   Fri Oct 12 14:38:42 2012 +0200

    Merge branch 'master' into el6

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