Signed-off-by: bqyx <llw@ysigiatec.com>
Merge branch 'master' of http://github.com/sgewuhan/vim.git
Signed-off-by: bqyx <llw@ysigiatec.com>
Merge branch 'master' of http://github.com/sgewuhan/vim.git

Conflicts:
	com.sg.vim.print/src/com/sg/vim/print/PrintPanel.java

Signed-off-by: bqyx <llw@ysigiatec.com>