projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b88980 00f3dfc)
[Merge] Merge with lp:openobject-addons
authorJalpesh Patel (OpenERP) <pja@tinyerp.com>
Fri, 12 Oct 2012 08:52:35 +0000 (14:22 +0530)
committerJalpesh Patel (OpenERP) <pja@tinyerp.com>
Fri, 12 Oct 2012 08:52:35 +0000 (14:22 +0530)
bzr revid: pja@tinyerp.com-20121010050854-jl6pyydhr7un9pp6
bzr revid: pja@tinyerp.com-20121012085235-dy62vb0q5xbwy2cm


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