odoo/odoo — pull request #1181 by mart-e (2014-07-15 14:08:01+00:00)
Title: 7.0 fixes branch mat

diverse fixes to check on the runbot, please ignore