projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0839d6 d2aa564)
[MERGE]
authorJni (Open ERP) <jni@tinyerp.com>
Fri, 12 Nov 2010 10:27:19 +0000 (15:57 +0530)
committerJni (Open ERP) <jni@tinyerp.com>
Fri, 12 Nov 2010 10:27:19 +0000 (15:57 +0530)
bzr revid: apa@tinyerp.com-20101112043645-xxqmwayopk0pcfe8
bzr revid: jni@tinyerp.com-20101112102719-cqgvszxhz91bzmtp


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.