radicale/radicale
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
..
acl Merge branch 'carddav', and update copyright dates 2012-01-23 16:21:30 +01:00
storage Merge branch 'carddav', and update copyright dates 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
__main__.py Merge branch 'carddav', and update copyright dates 2012-01-23 16:21:30 +01:00
config.py Merge branch 'carddav', and update copyright dates 2012-01-23 16:21:30 +01:00
ical.py Merge branch 'carddav', and update copyright dates 2012-01-23 16:21:30 +01:00
log.py Merge branch 'carddav', and update copyright dates 2012-01-23 16:21:30 +01:00
xmlutils.py Merge branch 'carddav', and update copyright dates 2012-01-23 16:21:30 +01:00