projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ea84f6 daef4a7)
[MRG] merge with lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 22 Jun 2012 12:12:12 +0000 (17:42 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Fri, 22 Jun 2012 12:12:12 +0000 (17:42 +0530)
bzr revid: tpa@tinyerp.com-20120622121212-xs22hchsj3zqk1pw


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.