[php-simplepie/el6] (8 commits) ...Merge branch 'master' into el6

[Nick Bebout]

Summary of changes:

  23767b3... Fix typo that causes a failure to update the common directo (*)
  634d047... dist-git conversion (*)
  a56d6ad... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  11c5950... bump to 1.2, since it's been out for two years.. (*)
  04f7930... - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass (*)
  f7b1bfa... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  203c39c... Upgrade to 1.3.1 (*)
  03e5034... Merge branch 'master' into el6

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