projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad06d1b 863f0d0)
[MERGE] Email Framework: lp:~openerp-dev/openobject-server/trunk-emails-unified
authorStephane Wirtel <stw@openerp.com>
Tue, 13 Sep 2011 14:50:55 +0000 (16:50 +0200)
committerStephane Wirtel <stw@openerp.com>
Tue, 13 Sep 2011 14:50:55 +0000 (16:50 +0200)
bzr revid: stw@openerp.com-20110913145055-wcwrbfmoebqycxbq


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