Files
Radicale/radicale/storage/database.py
Guillaume Ayoub fae2b30ec4 Merge branch 'master' of git://github.com/cristen/Radicale into cristen-master
Conflicts:
	radicale/storage/database.py
	schema.sql
2013-12-17 14:42:20 +01:00

8.8 KiB