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

[Christof Damian]

Summary of changes:

  a0e575e... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  c4526c5... upstream 4.2.2 (*)
  da892f5... Merge branch 'master' of ssh://pkgs.fedoraproject.org/php-s (*)
  e29daf8... use php_metadir (*)
  5703e63... Merge branch 'master' into f16

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