[MERGE] Merged with main addons.
authorThibault Delavallée <tde@openerp.com>
Thu, 10 May 2012 07:12:56 +0000 (09:12 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 10 May 2012 07:12:56 +0000 (09:12 +0200)
bzr revid: tde@openerp.com-20120510071256-jbgid3z67oemvr54

1  2 
addons/project/project.py
addons/project_issue/project_issue.py

Simple merge
Simple merge