[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Thu, 30 Jan 2014 10:37:13 +0000 (11:37 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Thu, 30 Jan 2014 10:37:13 +0000 (11:37 +0100)
commit28642435ab079c39e1934f2d1abfb1d47803b948
tree25b443c9540c682be9994aaa94c48d3fb649359c
parent8cf2adf5e314203debbec78edd7b163b40248348
parent947fe0da240d08650ce2348c22569b571be4a33c
[MERGE] from trunk

bzr revid: fva@openerp.com-20140130103713-k21ji454zhup0row