[MERGE] from trunk-website-al
authorXavier Morel <xmo@openerp.com>
Mon, 12 Aug 2013 07:56:50 +0000 (09:56 +0200)
committerXavier Morel <xmo@openerp.com>
Mon, 12 Aug 2013 07:56:50 +0000 (09:56 +0200)
commit212f088aeacdfd0a54ce3066438559fed943f9d2
tree1fbd12e8f1f8f14547e3709269b480f4afd375ae
parentdb5e36efa326be7ddb3bfface4ae7fb950462eaf
parentfcdbfe364d3e3a0033453e50835ed1abcda0b723
[MERGE] from trunk-website-al

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