From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 23 Jul 2014 18:57:22 +0000 (+0200)
Subject: Merge branch 'check_mk' of https://github.com/morlix/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5000130ec32c7fb07b54f41ca1d8af9a0b3209d;p=people%2Farne_f%2Fipfire-2.x.git

Merge branch 'check_mk' of https://github.com/morlix/ipfire-2.x into next
---

c5000130ec32c7fb07b54f41ca1d8af9a0b3209d