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

[Christof Damian]

Summary of changes:

  563bd38... upstream 1.1.3 (*)
  d133569... upstream 1.1.3 (*)
  45412b0... Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-p (*)
  b64c063... Merge branch 'master' into el6

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