Merge remote-tracking branch 'morlix/check_mk'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 Aug 2014 08:28:57 +0000 (10:28 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 Aug 2014 08:28:57 +0000 (10:28 +0200)

Trivial merge