[kronolith/el5/master] (15 commits) ...Merge branch 'master' into el5

[Nick Bebout]

Summary of changes:

  6847c20... Upgraded to upstream 2.1.5 (*)
  9e5c804... Upgrade to 2.1.6 (*)
  aa43f5b... Update to 2.1.7 (*)
  1da612d... Upgrade to 2.1.8 (*)
  6140b1e... Fixed space/tab mix, removed macro from changelog (*)
  2113eac... Rawhide Horde Updates (*)
  fd01c35... How on earth did I forget to Upload? (*)
  ad84318... - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass (*)
  f5aef5c... - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass (*)
  31dac64... Fix typo that causes a failure to update the common directo (*)
  bb6a400... Upgrade to 2.3.4 (*)
  2e46fca... dist-git conversion (*)
  9436878... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  8b5e821... Upgrade to 2.3.5 (*)
  207721b... Merge branch 'master' into el5

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