[MERGE] loading: changes to add --all to the -i option.
authorVo Minh Thu <vmt@openerp.com>
Thu, 1 Dec 2011 14:22:50 +0000 (15:22 +0100)
committerVo Minh Thu <vmt@openerp.com>
Thu, 1 Dec 2011 14:22:50 +0000 (15:22 +0100)
commit22c0a0f8cc1dd7fbd4716527930cef07505709a7
tree329357491d5062558e2a460f245d8259b20b94bd
parent43745c4cb9653f40f72a261da655caa4dabe40e7
parent9212a7f81a4cc1fe74e81cdd4d58523119460a03
[MERGE] loading: changes to add --all to the -i option.
This merges only part of the merged branch, which inlcuded two different things.

bzr revid: vmt@openerp.com-20111201142250-rmptyomi7px826y0
openerp-server