[MERGE] staging branch with new version of lunch module, made by api
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 7 Nov 2012 11:10:43 +0000 (12:10 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 7 Nov 2012 11:10:43 +0000 (12:10 +0100)
commitf22e2397d630344ba26875a02181e41b3d297504
tree1b26b047a4cf0205accb344bb73b3dcfacd1dd5e
parent1c5e8da2765e51b2c8bb49c6d1bf3c6b55c95dbf
parent385bf30ae34914c06459bd731839867f0d9510dd
[MERGE] staging branch with new version of lunch module, made by api

bzr revid: qdp-launchpad@openerp.com-20121107111043-hoxenf5bsl0dmxfl