tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	config
	radicale/acl/authLdap.py
	radicale/config.py
	radicale/log.py
This commit is contained in:
Corentin Le Bail
2011-02-16 14:17:28 +01:00
parent 50919133ac 8ad91b74b6
commit 284063a270
4 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
radicale/acl/authLdap.py
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
import sys, ldap
import sys, ldap, syslog
from radicale import config, log