Module: check_mk
Branch: master
Commit: c7efc4ddc907b8d99b90c14a9e318581fe5e9039
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7efc4ddc907b8…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Fri Mar 28 11:32:49 2014 +0100
manually resolving merge conflicts in ChangeLog
---