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

Conflicts:
	radicale/__init__.py
This commit is contained in:
System User 2011-04-07 16:30:46 +02:00
commit 08b145e5ca
7 changed files with 85 additions and 49 deletions

View file

@ -39,8 +39,7 @@ except ImportError:
# Default configuration
INITIAL_CONFIG = {
"server": {
"host": "",
"port": "5232",
"hosts": "0.0.0.0:5232",
"daemon": "False",
"ssl": "False",
"certificate": "/etc/apache2/ssl/server.crt",