[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120814114638-pkj3d70sg9mr2hkv

diff --cc addons/mail/__init__.py
Simple merge

diff --cc addons/mail/mail_group.py
index 82dcb4b,79416fb..d9519ca
--- 1/addons/mail/mail_group.py
--- 2/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@@ -96,9 -124,17 +99,9 @@@ class mail_group(osv.Model)
              help="Small-sized photo of the group. It is automatically "\
                   "resized as a 50x50px image, with aspect ratio preserved. "\
                   "Use this field anywhere a small image is required."),
 -        'member_ids': fields.function(get_member_ids, fnct_search=search_member_ids,
 -            type='many2many', relation='res.users', string='Group members', multi='get_member_ids',
 -            deprecated='This field will be deleted in a few hours or days, so please do not use it.'),
 -        'member_count': fields.function(get_member_ids, type='integer',
 -            string='Member count', multi='get_member_ids',
 -            deprecated='This field will be deleted in a few hours or days, so please do not use it.'),
 -        'is_subscriber': fields.function(get_member_ids, type='boolean',
 -            string='Joined', multi='get_member_ids'),
 -        'last_month_msg_nbr': fields.function(get_last_month_msg_nbr, type='integer',
 +        'last_month_msg_nbr': fields.function(_get_last_month_msg_nbr, type='integer',
              string='Messages count for last month'),
-         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True, 
+         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", 
                                      help="The email address associated with this group. New emails received will automatically "
                                           "create new topics."),
      }

diff --cc addons/mail/mail_group_view.xml
Simple merge

diff --cc addons/mail/static/src/js/mail.js
Simple merge

diff --cc addons/mail/static/src/xml/mail.xml
Simple merge