[MERGE] remote module import
authorFabien Meghazi <fme@openerp.com>
Thu, 27 Mar 2014 14:12:33 +0000 (15:12 +0100)
committerFabien Meghazi <fme@openerp.com>
Thu, 27 Mar 2014 14:12:33 +0000 (15:12 +0100)
bzr revid: fme@openerp.com-20140327141233-i7xu8ism7howhflv


Trivial merge