Module: check_mk
Branch: master
Commit: 7f6f1ddb645c03354487ad583356008b62554fa3
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f6f1ddb645c03…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Thu May 21 20:51:22 2015 +0200
fixed merge conflict
---