[php-swift-Swift/f18] (5 commits) ...Merge branch 'master' into f18

[Christof Damian]

Summary of changes:

  c4526c5... upstream 4.2.2 (*)
  da892f5... Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-s (*)
  5f12d09... Merge branch 'master' into f18
  e29daf8... use php_metadir (*)
  ed99da6... Merge branch 'master' into f18

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