[MERGE] from upstream
authorFrédéric van der Essen <fva@openerp.com>
Tue, 25 Feb 2014 10:59:24 +0000 (11:59 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 25 Feb 2014 10:59:24 +0000 (11:59 +0100)
commit009451f1dc9850bcea20f16436a33e2f1815bb89
treeef38df35deea4bae82fe6e44d5bd8364dbe5a875
parentc1d5d858eb462a3d106dfb3f634895d16e261561
parentbb795e929d8239508d58097f06029350296cc22b
[MERGE] from upstream

bzr revid: fva@openerp.com-20140225105924-1r2c9ha7703zlfxz