From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 16 Jul 2014 18:58:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'morlix/check_mk'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3c3a6ba5bae10987336ce8170f1d0359c6e8efb;p=people%2Fms%2Fipfire-2.x.git

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

e3c3a6ba5bae10987336ce8170f1d0359c6e8efb