merge lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam-config-tpa
authorJigar Amin - OpenERP <jam@tinyerp.com>
Fri, 29 Jun 2012 10:50:59 +0000 (16:20 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Fri, 29 Jun 2012 10:50:59 +0000 (16:20 +0530)
commitb3c2a5e273eac18e896d6a7ffbe98baa5f23c9ac
tree8713f0c03aa264201454406f5a501f19824a67d0
parent58f095d89df5d7d4294629dbafbae46f07e87ff4
parent890b9cdc415dbf12726f6f241c0a6376722b673f
merge lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam-config-tpa

bzr revid: jam@tinyerp.com-20120629105059-lmv7jtdkrjwai3pp