[MRG] merged main branch
authorStefan Rijnhart <stefan@therp.nl>
Wed, 22 Jun 2011 09:54:00 +0000 (11:54 +0200)
committerStefan Rijnhart <stefan@therp.nl>
Wed, 22 Jun 2011 09:54:00 +0000 (11:54 +0200)
commit4e7e41f51d8eb603f07fc70b41aaa5514f5a6f99
treebd7bf44bfd53f5c7f8736fe44ec9ce1eaa0842b4
parenteeb257661cc22fb9309c58bc17f3ac991e2053d0
parent6dd5f3bc5e2a753c8060206536e77c853aacaeee
[MRG] merged main branch

bzr revid: stefan@therp.nl-20110622095400-sn4025tjk2fvfnol
addons/users_ldap/users_ldap.py