Merge branch 'master' into check_mk
authorTimo Eissler <timo@eissler.pro>
Sat, 19 Oct 2013 22:46:53 +0000 (00:46 +0200)
committerTimo Eissler <timo@eissler.pro>
Sat, 19 Oct 2013 22:46:53 +0000 (00:46 +0200)

Trivial merge