Module: check_mk
Branch: master
Commit: 032973251c93196a36b4c80df19475245f6fd529
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=032973251c9319…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Thu Dec 4 14:56:12 2014 +0100
Merge conflict
---