Merge remote-tracking branch 'odoo/master' into master-sass-in-bundles-fme
authorFabien Meghazi <fme@openerp.com>
Tue, 1 Jul 2014 12:26:40 +0000 (14:26 +0200)
committerFabien Meghazi <fme@openerp.com>
Tue, 1 Jul 2014 12:26:40 +0000 (14:26 +0200)
1  2 
openerp/addons/base/ir/ir_ui_view.py

Simple merge