[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Tue, 25 Sep 2012 16:31:22 +0000 (18:31 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 25 Sep 2012 16:31:22 +0000 (18:31 +0200)
commit92efdf10c8d2924ec5e295112047cf2177a85d15
tree9013b45a217f2b81b0b823992670bb2821c51691
parente0fb9355a9e3983a276165ee293f71b98b88f225
parent8a7ccd3c760496e35460e514231467c41b92dde8
[MERGE] from trunk

bzr revid: fva@openerp.com-20120925163122-zgxa0kyeo1q6maex