Merge branch 'master' of git://gitorious.org/~clebail/radicale/ares-radicale

Conflicts:
	config
	radicale/acl/authLdap.py
	radicale/config.py
	radicale/log.py
This commit is contained in:
Corentin Le Bail
2011-02-16 14:17:28 +01:00
4 changed files with 23 additions and 4 deletions

View File

@@ -19,4 +19,5 @@ class log:
_LOGGING = log()
sys.modules[__name__] = _LOGGING
sys.modules[__name__] = _LOGGING