[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Wed, 26 Mar 2014 13:12:29 +0000 (14:12 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Wed, 26 Mar 2014 13:12:29 +0000 (14:12 +0100)
commit0b087ff6a1e398c96ced725b7dccb7d1fd935c38
treea8e0a9dee4818d7b94ec169e51481eff7cc0c519
parent2378decc042b9c404441b52e26b55f700f065319
parente58f289aebff7dabd37b72f8b4d334a89e4e9fd5
[MERGE] from trunk

bzr revid: fva@openerp.com-20140326131229-euztmx4puq02pz1z