[MERGE] lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam-security-tpa
authorJigar Amin - OpenERP <jam@tinyerp.com>
Fri, 29 Jun 2012 09:43:31 +0000 (15:13 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Fri, 29 Jun 2012 09:43:31 +0000 (15:13 +0530)
commit4602e09c205973e08620af08f2ed0f1720b87b86
treee93a25a06741624ddc5e67667f8a2a7f1c01455a
parentf9f4ae0c1acb69736f03eea76c44e13c2086d16f
parent02b332d2486e081d2118725002798306a7b2696d
[MERGE] lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam-security-tpa

bzr revid: jam@tinyerp.com-20120629094331-v2crkkgmnaim8u4t
addons/crm/crm_demo.xml
addons/mail/security/ir.model.access.csv