[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)
commitbe59c064034ce1ee27bba25ca76a6085b8e7783d
tree984cda2acfb5645813829e7c53ae3dfddf094bb3
parent724bbffc88e444b50c1622c942b8c4554646d367
parent6188a2af5bd7a210f15a4e7f1c6991ba0bfd19b3
[MERGE] from trunk

bzr revid: xmo@openerp.com-20130923111950-uk163cp891zl021h
openerp/tools/convert.py