Module: check_mk
Branch: master
Commit: ed4c6d0e628f965bf3f61590c205de1ea15ba096
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed4c6d0e628f96…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Fri Aug 21 16:52:40 2015 +0200
Fixed merge conflict
---