Merge remote-tracking branch 'morlix/check_mk' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 22 Oct 2013 11:15:36 +0000 (13:15 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 22 Oct 2013 11:15:36 +0000 (13:15 +0200)

Trivial merge