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

[fenris02]

Summary of changes:

  3a70992... Import 2.0.11.1 (*)
  cd15cd8... Merge remote-tracking branch 'origin/master' into f17

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