Module: check_mk
Branch: master
Commit: 8d71d364e5111e48e08292e10f3d2f1ca82ee287
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d71d364e5111e…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Tue Apr 22 16:20:21 2014 +0200
manually resolved merge conflicts in ChangeLog
---