m
Merge branch 'master' of https://github.com/aspalit10/OE_shipment

Conflicts:
	__init__.py
	__openerp__.py