[php-channel-phing/el6] (6 commits) ...Merge branch 'master' into el6

[Christof Damian]

Summary of changes:

  afe2053... Fix typo that causes a failure to update the common directo (*)
  a4e7073... dist-git conversion (*)
  a3f24ad... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  4af46d4... - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass (*)
  f370b39... update channel information, bug #766477 (*)
  179e95d... Merge branch 'master' into el6

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