Merge remote-tracking branch 'morlix/check_mk' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 26 Jul 2014 19:34:06 +0000 (21:34 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 26 Jul 2014 19:34:06 +0000 (21:34 +0200)

Trivial merge