[MERGE] from trunk
authorXavier Morel <xmo@openerp.com>
Mon, 9 Sep 2013 09:50:42 +0000 (11:50 +0200)
committerXavier Morel <xmo@openerp.com>
Mon, 9 Sep 2013 09:50:42 +0000 (11:50 +0200)
commitbb14116785a405432c834cb39e8d1ec6a4ce5d43
tree69544fd65bc2eadf2a4a9c7ea98799689c4dedd0
parentde952ae35269fb1cae6d875ad935892e849e83f5
parenta61e7b5efa4c04f45a8a2a15eca5dc052b4a8122
[MERGE] from trunk

bzr revid: xmo@openerp.com-20130909095042-zf9p1qybf4f2b7gu
openerp/addons/base/ir/ir_ui_view.py
openerp/tools/convert.py
openerp/tools/qweb.py