[MERGE] trunk
authorSimon Lejeune <sle@openerp.com>
Tue, 8 Apr 2014 13:51:37 +0000 (15:51 +0200)
committerSimon Lejeune <sle@openerp.com>
Tue, 8 Apr 2014 13:51:37 +0000 (15:51 +0200)
bzr revid: sle@openerp.com-20140407133627-36iijkx89552bwa0
bzr revid: sle@openerp.com-20140407174628-24wysrr3g8x0fijd
bzr revid: sle@openerp.com-20140408135137-0ficpzark3mjys9r

1  2 
openerp/addons/base/ir/ir_actions.py
openerp/addons/base/ir/ir_qweb.py

Simple merge
Simple merge