[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Mon, 3 Feb 2014 10:51:47 +0000 (11:51 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 3 Feb 2014 10:51:47 +0000 (11:51 +0100)
commit49d60fbaa44b5bff479e8586f6d7404219c93b28
treeb8ec23baa90cd8ab5c4d2865540c91ddab1885c1
parent7304a68c62531bade54d6cf9211419af582443fc
parentc25827f84544b6ea3004c7a354122284310c528b
[MERGE] from trunk

bzr revid: fva@openerp.com-20140203105147-1rwz4ja8q5y4gqe8