[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)
commit09ab2d4109b7b5db4360f3d197b33b3b8f984685
tree68d162182134ebdb7ebca3e51cbfc06e1b4a3761
parent60a82133cc0e0d7c4879b6c518054cbd44e20c0c
parent938502aa37b53f218a2b48e1fb36f45cb6fa67ef
[MERGE] Forward-port 7.0 up to 938502a
openerp/modules/loading.py