Corentin Le Bail 284063a270 Merge branch 'master' of git://gitorious.org/~clebail/radicale/ares-radicale ...

Conflicts:
	config
	radicale/acl/authLdap.py
	radicale/config.py
	radicale/log.py

2011-02-16 14:17:28 +01:00

1.5 KiB

Raw Blame History

View Raw