Module: check_mk Branch: master Commit: e4fee043b4f925c14dd9df34fa9e29df070ff077 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4fee043b4f925… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Mar 9 16:19:55 2012 +0100 Merge branch 'master' into tobi Conflicts: web/htdocs/htmllib.py web/htdocs/wato.py ---