projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 724bbff 6188a2a)
[MERGE] from trunk
authorXavier Morel <xmo@openerp.com>
Mon, 23 Sep 2013 11:19:50 +0000 (13:19 +0200)
committerXavier Morel <xmo@openerp.com>
Mon, 23 Sep 2013 11:19:50 +0000 (13:19 +0200)
bzr revid: xmo@openerp.com-20130923111950-uk163cp891zl021h

1  2 
openerp/tools/convert.py patch | diff1 | diff2 | blob | history

diff --cc openerp/tools/convert.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.