Module: check_mk
Branch: master
Commit: ebad9014380b52e42bcdcdbf8782f0cd6aa2fa52
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebad9014380b52…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Thu Dec 3 13:37:46 2015 +0100
merge conflict
---