[MERGE] lp:openobject-addons

bzr revid: jam@tinyerp.com-20120628043300-y3hc96fwwzvoe9hv

diff --cc addons/crm/crm_data.xml
Simple merge

diff --cc addons/mail/res_users.py
index b3644df,f62e29f..4e6e5be
--- 1/addons/mail/res_users.py
--- 2/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@@ -37,9 -36,8 +37,9 @@@ class res_users(osv.osv)
                          ('comments', 'Only comments'),
                          ('to_me', 'Only when sent directly to me'),
                          ('none', 'Never')
-                         ], 'Receive Feeds by E-mail', required=True,
+                         ], 'Receive Feeds by Email', required=True,
                          help="Choose in which case you want to receive an email when you receive new feeds."),
 +        'alias_id': fields.many2one('mail.alias', 'Mail Alias', ondelete="cascade", required=True),
      }
      
      _defaults = {