[MERGE] Sync with saas-2
authorThibault Delavallée <tde@openerp.com>
Mon, 4 Nov 2013 10:58:27 +0000 (11:58 +0100)
committerThibault Delavallée <tde@openerp.com>
Mon, 4 Nov 2013 10:58:27 +0000 (11:58 +0100)
bzr revid: tde@openerp.com-20131104105827-gbpsn66twnon20rw

1  2 
addons/crm/crm.py
addons/project_issue/project_issue.py

Simple merge
Simple merge