Merge branch 'git' of github.com:cristen/Radicale into git

Conflicts:
	config
This commit is contained in:
Jean-Marc Martins
2013-09-13 17:27:32 +02:00

Diff Content Not Available