[MERGE] from upstream
authorFrédéric van der Essen <fva@openerp.com>
Fri, 15 Nov 2013 12:57:22 +0000 (13:57 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 15 Nov 2013 12:57:22 +0000 (13:57 +0100)
commitb755525f92d82e7bd8e2aecb6939c148e87fa326
tree9c82fbe775bdf041392029d11db4a3df6a6a6029
parentf049e4e09a6fdd070ed9e3cfde47211eca0c6453
parentf8a32c79ba8e018b731fa02c32a79e461c9d8250
[MERGE] from upstream

bzr revid: fva@openerp.com-20131115125722-uedvm4axo30g7njn