System User 3a9226ca80 Merge branch 'master' of git://gitorious.org/radicale/radicale ...

Conflicts:

	radicale/xmlutils.py

2010-12-23 10:10:40 +01:00

..

acl

cn => dn

2010-12-02 17:58:56 +01:00

__init__.py

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

2010-12-23 10:10:40 +01:00

config.py

cn => dn

2010-12-02 17:58:56 +01:00

ical.py

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

2010-11-11 21:48:09 +01:00

log.py

os.path.expanduser for logging file name

2010-12-02 16:57:02 +01:00

xmlutils.py

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

2010-12-23 10:10:40 +01:00