[MERGE] Forward-port 7.0 up to 938502a
authorOlivier Dony <odo@openerp.com>
Wed, 17 Sep 2014 13:13:42 +0000 (15:13 +0200)
committerOlivier Dony <odo@openerp.com>
Wed, 17 Sep 2014 13:13:42 +0000 (15:13 +0200)
1  2 
openerp/modules/loading.py

Simple merge