Module: check_mk
Branch: master
Commit: 45b3abbaaa9311ada9d878065e23d030f133fa43
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45b3abbaaa9311…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Feb 14 15:01:02 2012 +0100
Merge branch 'master' of
ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk
Conflicts:
ChangeLog
web/htdocs/login.py
---