Merge proposals dependent on lp:~openerp-dev/openobject-server/ssi-dev-framework

lp:~openerp-dev/openobject-server/ssi-dev-framework has no merge proposals.