Module: check_mk
Branch: master
Commit: de32aa1488333af866bfd3492a95ec1bb1768e34
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de32aa1488333a…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Fri Feb 7 18:02:20 2014 +0100
manually resolved merge conflict in ChangeLog
---