Module: check_mk
Branch: master
Commit: 2ca5b63a217902ca555f3915ad2a052926222728
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ca5b63a217902…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Thu Jan 21 14:16:25 2016 +0100
Merge conflict
---