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)
bzr revid: jam@tinyerp.com-20120629105059-lmv7jtdkrjwai3pp


Trivial merge