[php-phpunit-PHP-TokenStream/el6] (4 commits) ...Merge branch 'master' into el6

[Christof Damian]

Summary of changes:

  15afff7... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  d02ecff... upstream 1.1.5 (*)
  37426d4... Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-p (*)
  a49fe52... Merge branch 'master' into el6

(*) This commit already existed in another branch; no separate mail sent