[MERGE] document_ftp: use the --load command line option.
authorVo Minh Thu <vmt@openerp.com>
Fri, 7 Oct 2011 14:06:53 +0000 (16:06 +0200)
committerVo Minh Thu <vmt@openerp.com>
Fri, 7 Oct 2011 14:06:53 +0000 (16:06 +0200)
bzr revid: vmt@openerp.com-20111007140653-52nkqyxwrsofy6u5

1  2 
addons/document_ftp/__openerp__.py

Simple merge