Module: check_mk
Branch: master
Commit: 21d9d53ce0a139f0ae367e96ee2e248dc3463137
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21d9d53ce0a139…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Tue Dec 17 16:54:43 2013 +0100
fixed merge conflict in ChangeLog
---