Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk - Checkmk git commits

25 Aug 2011

Module: check_mk
Branch: master
Commit: 18cd636ff07d1e82d02e16f59c8c802aebab1273
URL:   
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18cd636ff07d1e…

Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt;
Date:   Thu Aug 25 10:23:32 2011 +0200

Merge branch 'master' of ssh://mathias-kettner.de/check_mk

Conflicts:
	ChangeLog
	web/htdocs/views.py

---