[dokuwiki/f16] (8 commits) ...Merge branch 'master' into f16

[topdog]

Summary of changes:

  4fa3d3c... - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass (*)
  846b35c... * fix CVE-2012-2129 (*)
  645bf20... * update spec (*)
  2fa25f5... * add patch (*)
  7b8eb2e... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  37b2762... Update to latest upstream (*)
  76baa02... update to latest upstream (*)
  fe620ac... Merge branch 'master' into f16

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