[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Mon, 13 Jan 2014 10:53:44 +0000 (11:53 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 13 Jan 2014 10:53:44 +0000 (11:53 +0100)
commit310807b2864643b765a0daf3d4ce5e4e605c15ae
tree13373b9af2663b86dfbe6f93033d04ac5d9d923f
parent0b580af49bcc63eb38390c3c769ce33d70873efe
parentfb6f7b406d578dadb3cdf23c06929db0e067f8de
[MERGE] from trunk

bzr revid: fva@openerp.com-20140113105344-285tkvqrnmza0awn