[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Tue, 11 Feb 2014 16:50:43 +0000 (17:50 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 11 Feb 2014 16:50:43 +0000 (17:50 +0100)
commitbfcc2fead3142c50b609af617c863dad036844ac
tree0d5bc46185ed7150986cd2b3128c20f28819a465
parentbcc6a6aeda2dd9dde545d5064c6a85180cdd8e80
parentd93fce56b65fc95b5f61c76ebf55c4a2bc2a53f9
[MERGE] from trunk

bzr revid: fva@openerp.com-20140211165043-3t8nys0btenqie59