[MERGE] Merge with lp:openobject-server
[MERGE] Merge with lp:openobject-server
MarkusTeufelberger/openobject-server,gisce/openobject-server,gisce/openobject-server,ovnicraft/openerp-server,ovnicraft/openerp-server,splbio/openobject-server,splbio/openobject-server,gisce/openobject-server,splbio/openobject-server,MarkusTeufelberger/openobject-server,MarkusTeufelberger/openobject-server