[php-phpunit-File-Iterator/f13/master] (7 commits) ...fix merge

[Christof Damian]

Summary of changes:

  58c8819... upstream 1.2.1 (*)
  44f87d8... upstream 1.2.2, bugfix (*)
  f1cc283... fix php-pear requirement (*)
  3899469... dist-git conversion (*)
  18b1174... upstream 1.2.3 (*)
  54d6926... Merge branch 'master' into f13
  ae6e4bb... fix merge

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