Guillaume Ayoub 9c4a85ef1f Merge branch 'carddav', and update copyright dates ...

Conflicts:
	radicale/__init__.py
	radicale/ical.py
	radicale/xmlutils.py

2012-01-23 16:21:30 +01:00

..

__init__.py

Merge branch 'carddav', and update copyright dates

2012-01-23 16:21:30 +01:00

courier.py

Fix a try/catch

2011-10-27 13:26:05 +02:00

htpasswd.py

Merge branch 'carddav', and update copyright dates

2012-01-23 16:21:30 +01:00

LDAP.py

Merge branch 'carddav', and update copyright dates

2012-01-23 16:21:30 +01:00

PAM.py

Add an empty line (it's a source of stress for me, I'm sorry)

2011-10-03 00:34:01 +02:00