[checkmk-commits] Check_MK Git: check_mk: Merge branch 'master' of 10.52.110.108:git/check_mk

[Lars Michelsen]

Module: check_mk
Branch: master
Commit: 45116761d5d01776be4d4c96c7730df5c05bad7a
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45116761d5d01776be4d4c96c7730df5c05bad7a

Author: Lars Michelsen <lm at mathias-kettner.de>
Date:   Thu Feb 10 09:45:09 2011 +0100

Merge branch 'master' of 10.52.110.108:git/check_mk

Conflicts:
	ChangeLog

---