my own changes
apply color-digraph-list.patch from Dominique
cjk linebreak patch
Merge branch 'myvim' into all
things changed because of compiling
Merge branch 'master' into all
add .gitignore
Merge branch 'master' into all

Conflicts:
	.gitignore
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into myvim
Merge branch 'myvim' into all
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into all
ftplugin/perl.vim: set iskeyword locally

this has been fixed upstream, see
https://github.com/vim-perl/vim-perl/pull/137
Merge branch 'master' of github.com:b4winckler/vim
Merge branch 'master' into myvim
Merge branch 'myvim' into all
Merge branch 'master' of github.com:b4winckler/vim
Merge branch 'master' into all
Merge branch 'master' into myvim