[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Thu, 30 Jan 2014 13:31:21 +0000 (14:31 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Thu, 30 Jan 2014 13:31:21 +0000 (14:31 +0100)
commit7304a68c62531bade54d6cf9211419af582443fc
tree558a98495f6e39892f33826324693e1897a9df75
parent28642435ab079c39e1934f2d1abfb1d47803b948
parentd5031cbee897f8fe6fa111a3cfe4f6510aff9e92
[MERGE] from trunk

bzr revid: fva@openerp.com-20140130133121-4n75ma3xp5wn77du