Module: check_mk
Branch: master
Commit: 33dc8fbe75f4da75f4a549481b2367c2c89ea192
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33dc8fbe75f4da…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Thu Nov 7 13:03:00 2013 +0100
Merge conflict
---