Module: check_mk
Branch: master
Commit: f33bdd9bfd4b05c6d2928121da323721549a91c9
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f33bdd9bfd4b05…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Jan 30 18:53:35 2012 +0100
resolved merge conflict
---