[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Fri, 25 Apr 2014 12:25:10 +0000 (14:25 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 25 Apr 2014 12:25:10 +0000 (14:25 +0200)
commitf210babfc615d558d5eac05914671c80bafd9b7c
treea7873b6b6bdb16a4f541a64a3f217b62ba0f7dbd
parent3f0a8e8931adfb40b4393074193a00bc20ede601
parent8522ae723c37e9b6ecfb7b00803049f50ffc7ce4
[MERGE] from trunk

bzr revid: fva@openerp.com-20140425122510-y60j039e3khbwwd5