[MERGE] staging branch
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 12 Dec 2012 11:34:48 +0000 (12:34 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 12 Dec 2012 11:34:48 +0000 (12:34 +0100)
commit159771c1f695fdc070c7791d1dc9b958c8d9356a
treea9fb98f8150443c0df5597752f830e118110fb45
parent5a53cbebfc9b6dbf265b049557f5ca11ef65759c
parentd2d65234edf9b214e1679c47fda63991c4bb78b0
[MERGE] staging branch

bzr revid: qdp-launchpad@openerp.com-20121212113448-3ueoqbutbdu9pcar