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

Conflicts:
	config
	radicale/__init__.py
	radicale/config.py
	radicale/log.py

config

@@ -28,8 +28,13 @@ stock = utf-8
 
 [acl]
 # Access method
+<<<<<<< HEAD
 # Value: fake | htpasswd | authLdap
 type = fake
+=======
+# Value: None | htpasswd
+type = None
+>>>>>>> d9ea784e31687b03f1451bc5b543122f05c5deb1
 # Personal calendars only available for logged in users (if needed)
 personal = False
 # Htpasswd filename (if needed)
@@ -53,6 +58,7 @@ LDAPAppend = ou=users,dc=exmaple,dc=dom
 # created if not present
 folder = ~/.config/radicale/calendars
 
+<<<<<<< HEAD
 [Logging]
 # Logging type
 # Value: syslog | file | stdout
@@ -61,5 +67,15 @@ type = file
 logfile = ~/.config/radicale/radicale.log
 # Log facility 10: DEBUG, 20: INFO, 30 WARNING, 40 ERROR, 50 CRITICAL
 facility = 50
+=======
+[logging]
+# Logging configuration file
+# If no config is given, simple information is printed on the standard output
+# For more information about the syntax of the configuration file, see:
+# http://docs.python.org/library/logging.config.html
+config = /etc/radicale/logging
+# Set the default logging level to debug
+debug = False
+>>>>>>> d9ea784e31687b03f1451bc5b543122f05c5deb1
 
 # vim:ft=cfg