[cd-discid/el6] (7 commits) ...Merge branch 'master' into el6

[Dominik Mierzejewski]

Summary of changes:

  d6a5687... Fix typo that causes a failure to update the common directo (*)
  f1998e6... dist-git conversion (*)
  b2a5620... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  b489ab9... - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass (*)
  a64f6bf... Update to 1.3.1. (*)
  7bafa4c... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  291a208... Merge branch 'master' into el6

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