projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d2c0ed 052f2ac)
[MERGE] lp:~openerp-dev/openobject-addons/trunk-mail-alias-jam-res-user-tpa
authorJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 26 Jun 2012 11:13:34 +0000 (16:43 +0530)
committerJigar Amin - OpenERP <jam@tinyerp.com>
Tue, 26 Jun 2012 11:13:34 +0000 (16:43 +0530)
bzr revid: jam@tinyerp.com-20120626111334-9kef58t1wb8kjsn9


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