[MERGE] upstream
authorFabien Meghazi <fme@openerp.com>
Tue, 25 Feb 2014 10:50:45 +0000 (11:50 +0100)
committerFabien Meghazi <fme@openerp.com>
Tue, 25 Feb 2014 10:50:45 +0000 (11:50 +0100)
commit5da9305bf57f0f3e397b5e73fdf0def409503008
tree07de9ec6d68b9d78670cb0ec2f4d2aa65845e18d
parent587ada964ee238814cb82fbba14d606ab9be007f
parent6df317c54629e5c222e8db511b38ada767ec60af
[MERGE] upstream

bzr revid: fme@openerp.com-20140225105045-9t4a443nq0lw55qu