[cacti/el6] (53 commits) ...rm merge artifacts

[Ken Dreyer]

Summary of changes:

  3b1679b... Initialize branch EL-4 for cacti (*)
  389021d... Initialize branch EL-5 for cacti (*)
  a5fb5e6... Patches for bug#243592 (*)
  9ad6793... Patches for bug#243592 (*)
  b988414... Release bump because Its friday and I'm stupid (*)
  c3789dc... Release bump because Its friday and I'm stupid (*)
  dd3b5d9... Added official patches from the cacti site (*)
  3e81d99... Added official patches from the cacti site (*)
  1c0cdda... removed un-needed patches as well as new upstream version (*)
  813c484... removed un-needed patches as well as new upstream version (*)
  942b5dc... changed permissions on db.php - #396331 (*)
  57a92d5... changed permissions on db.php - #396331 (*)
  6ca0e6c... upstream released new version (*)
  0637770... upstream released new version (*)
  b4bb091... updated license and fixed changelog issue (*)
  c925d37... updated license and fixed changelog issue (*)
  e9d0ebd... upstream released new version (*)
  0901f26... upstream released new version (*)
  a114fdf... upstream released new version (*)
  f459b61... upstream released new version (*)
  f013a0e... Fix typo that causes a failure to update the common directo (*)
  e7b69cd... Fix typo that causes a failure to update the common directo (*)
  19117d7... Fix typo that causes a failure to update the common directo (*)
  58f490f... Applying upstream patches (*)
  13672f0... Adding upstream patches (*)
  5fdbec4... fixing patch name (*)
  d1905af... release bump (*)
  3707562... official patches (*)
  f090228... official patches (*)
  6bb9be2... Adding official patch to fix sql vulnerability (*)
  65fa712... fixing sql injection issues - 585207 (*)
  a3f509a... fixing sql injection issues - 585207 (*)
  5bb5c03... upstream released new version (*)
  0074e74... Upstream released new version (has security fixes) (*)
  254407a... Upstream released new version (has security fixes) (*)
  c7b26ec... Upstream released new version (*)
  e878653... Upstream released new version (*)
  cea4644... Upstream released new version (*)
  2e6f045... dist-git conversion (*)
  0609506... dist-git conversion (*)
  dd986b6... dist-git conversion (*)
  b91eebd... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  ed8c11a... bump release for koji (#690581) (*)
  49c521f... properly bump release (*)
  95142bf... MySQL 5.5 fix. (*)
  d154b2d... update to 0.8.7h (*)
  355ddff... update to 0.8.7h (*)
  ea94628... Merge branch 'master' into el4 (*)
  3336efd... Merge branch 'master' into el5 (*)
  c70dd17... Merge branch 'master' into el6 (*)
  89f0d5e... Merge branch 'el5' (*)
  fe9c79c... Merge branch 'el6' (*)
  f2fab19... rm merge artifacts (*)

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