Merge remote-tracking branch 'morlix/check_mk'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 16 Jul 2014 18:58:41 +0000 (20:58 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 16 Jul 2014 18:58:41 +0000 (20:58 +0200)

Trivial merge