[Merge]with: lp:openobject-addons
authorDBR (OpenERP) <dbr@tinyerp.com>
Wed, 14 Sep 2011 05:19:02 +0000 (10:49 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Wed, 14 Sep 2011 05:19:02 +0000 (10:49 +0530)
bzr revid: dbr@tinyerp.com-20110914051902-r73uw1yu1bck6xzn

1  2 
addons/project_mailgate/__openerp__.py
addons/project_scrum/__openerp__.py

Simple merge