From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 6 Aug 2014 08:28:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'morlix/check_mk'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ffd14f1407ca9be93a2edd65d7151567927fbb4;p=people%2Fmfischer%2Fipfire-2.x.git

Merge remote-tracking branch 'morlix/check_mk'
---

5ffd14f1407ca9be93a2edd65d7151567927fbb4