Commit Graph

2 Commits

Author SHA1 Message Date
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
Guillaume Ayoub
756c4aaf7e Put the executable script in the radicale package
Conflicts:

	NEWS.rst
2011-11-03 17:49:00 +01:00