[munin/el6] (5 commits) ...Merge remote-tracking branch 'origin/master' into el6

[fenris02]

Summary of changes:

  7040ce5... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  c7e7707... Default to a localhost name to prevent munin-node from comp (*)
  6ebb2e2... Perl 5.20 rebuild (*)
  3e35156... re-merge earlier commit for epel7 (*)
  fd03c49... Merge remote-tracking branch 'origin/master' into el6

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