commit 0ae74b5110416fa9e4c47ab4bd54c6d01db0e869
Merge: 285d9a5 d87d3dd
Author: remi <fedora at famillecollet.com>
Date: Tue Jan 17 18:49:40 2012 +0100
fix merge
.gitignore | 2 ++
php-phpunit-PHP-TokenStream.spec | 37 ++++++++++++++++++++++---------------
sources | 2 +-
3 files changed, 25 insertions(+), 16 deletions(-)
---