Module: check_mk
Branch: master
Commit: 1c1cdc7dfe5eb5f0de6b142fee660b5eadaeaf28
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c1cdc7dfe5eb5…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Fri Oct 24 15:51:59 2014 +0200
merge conflict
---