From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 22 Oct 2013 11:15:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'morlix/check_mk' into next
X-Git-Tag: v2.13-core74~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77117e740ccd09436449234be77b7a95d720043e;p=ipfire-2.x.git

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

77117e740ccd09436449234be77b7a95d720043e