Matthias Jordan 55a13d4c39 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	radicale/__init__.py
	radicale/acl/courier.py

2012-08-04 11:27:51 +02:00

..

__init__.py

Separation of authentication and authorization. Separation of read and write authorization.

2012-08-03 13:10:20 +02:00

courier.py

Merge remote-tracking branch 'upstream/master'

2012-08-04 11:27:51 +02:00

htpasswd.py

Separation of authentication and authorization. Separation of read and write authorization.

2012-08-03 13:10:20 +02:00

IMAP.py

Separation of authentication and authorization. Separation of read and write authorization.

2012-08-03 13:10:20 +02:00

LDAP.py

Separation of authentication and authorization. Separation of read and write authorization.

2012-08-03 13:10:20 +02:00

PAM.py

Separation of authentication and authorization. Separation of read and write authorization.

2012-08-03 13:10:20 +02:00