projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eeb2576 6dd5f3b)
[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)
bzr revid: stefan@therp.nl-20110622095400-sn4025tjk2fvfnol

1  2 
addons/users_ldap/users_ldap.py patch | diff1 | diff2 | blob | history

diff --cc addons/users_ldap/users_ldap.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.