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

..

acl

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

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

__init__.py

Logging

2011-02-16 13:53:27 +01:00

config.py

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

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

ical.py

Merge branch 'master' of gitorious.org:radicale/radicale

2010-11-11 21:48:09 +01:00

log.py

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

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

xmlutils.py

Logging

2011-02-16 13:53:27 +01:00