[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Thu, 16 Jan 2014 10:02:55 +0000 (11:02 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Thu, 16 Jan 2014 10:02:55 +0000 (11:02 +0100)
commit873a26e59fbaa3d703344f8f73aedad8e6ac195e
treef81e7ef42dae8e94f1b1d2b7bdad54543814cf65
parent2131aaa48ff7e08314dff41c060b3d0d961f16db
parent58907da3ee30be831083f6dcc804c31e7b73df5a
[MERGE] from trunk

bzr revid: fva@openerp.com-20140116100255-m35evr41zorwnl6y