odoo/odoo — pull request #2696 by nicoclavier (2014-09-25 08:42:31+00:00)
Title: Merge pull request #2 from odoo/master

Update from original