[dokuwiki/el5] (10 commits) ...Merge branch 'master' into el5

[Adam Tkac]

Summary of changes:

  d0a14ce... Fix apache config for httpd 2.4 (bz #871388) (*)
  87ba3f5... fix changelog (*)
  7605600... - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass (*)
  926c8f2... - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass (*)
  4a2b630... Remove bundled code in specfile instead of via patch (*)
  823bdc3... Update to the latest upstream (*)
  8cdc842... Upload new tarball. (*)
  7620cb2... Really upload current tarball. (*)
  1611053... Remove unused fix-CVE-2012-2129.patch patch. (*)
  8756cdd... Merge branch 'master' into el5

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