Module: check_mk
Branch: master
Commit: 85106d2b8bca4f55065bcddc5779fed1b2c0e595
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85106d2b8bca4f…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Oct 10 15:06:02 2012 +0200
resolved merge conflict in changelog
---