Merge lp://qastaging/~openerp/openobject-server/6.0-opw-6111-olt into lp://qastaging/openobject-server/6.0

Proposed by Olivier Laurent (Open ERP)
Status: Merged
Merged at revision: 3451
Proposed branch: lp://qastaging/~openerp/openobject-server/6.0-opw-6111-olt
Merge into: lp://qastaging/openobject-server/6.0
Diff against target: 58 lines (+8/-5)
2 files modified
bin/addons/base/base.sql (+1/-0)
bin/osv/orm.py (+7/-5)
To merge this branch: bzr merge lp://qastaging/~openerp/openobject-server/6.0-opw-6111-olt
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+65179@code.qastaging.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.