Merge branch 'master' into expt_add_path_flags_and_git

Conflicts:
	autoload/nerdtree.vim
	lib/nerdtree/creator.vim
This commit is contained in:
Martin Grenfell
2014-07-08 09:38:43 +01:00
14 changed files with 1119 additions and 1071 deletions

File diff suppressed because it is too large Load Diff