code_complete
Merge branch 'master' of github.com:jianglutian/vim

Conflicts:
	release/plugin/code_complete.vim