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

..

radicale

Merge branch 'carddav', and update copyright dates

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