Corentin Le Bail 270d98ace1 Merge branch 'master' of git://gitorious.org/radicale/radicale ...

Conflicts:
	radicale/xmlutils.py

2011-02-16 15:03:20 +01:00

..

acl

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

2011-02-16 15:03:20 +01:00

__init__.py

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

2011-02-16 15:03:20 +01:00

config.py

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

2011-02-16 15:03:20 +01:00

ical.py

Update copyright year

2011-01-09 17:46:22 +01:00

log.py

Merge branch 'master' of git://gitorious.org/~clebail/radicale/ares-radicale

2011-02-16 14:17:28 +01:00

xmlutils.py

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

2011-02-16 15:03:20 +01:00