Module: check_mk
Branch: master
Commit: 712e3ed8307bea9b7ce5e1608a97697fbb4850cb
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=712e3ed8307bea…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Wed Jul 2 10:33:22 2014 +0200
manually resolving merge conflicts in ChangeLog
---