Matthias Jordan 55a13d4c39 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	radicale/__init__.py
	radicale/acl/courier.py

2012-08-04 11:27:51 +02:00

362 B

Raw Blame History

View Raw