[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 27 Jun 2012 06:03:42 +0000 (11:33 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 27 Jun 2012 06:03:42 +0000 (11:33 +0530)
bzr revid: tpa@tinyerp.com-20120627060342-dmge386di1lk838b


Trivial merge