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

[fenris02]

Summary of changes:

  3a70992... Import 2.0.11.1 (*)
  9c93010... Merge remote-tracking branch 'origin/master' into el6

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