[pen/el6] (12 commits) ...Merge branch 'master' into el6

[Christopher Meng]

Summary of changes:

  465d2c0... Fix typo that causes a failure to update the common directo (*)
  f7323ce... dist-git conversion (*)
  b94d884... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  1bc5f13... - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass (*)
  5f94fae... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  16651fd... fix configuration for httpd 2.4, #871450 (*)
  9ca5eac... - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass (*)
  d427614... - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass (*)
  8b2acde... Update to 0.20.2, enable openssl support.
  fc63628... Merge branch 'master' into el6
  2d40b64... Bump again.
  e5e5a1f... Merge branch 'master' into el6

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