Martin Grenfell 634c23eadb Merge branch 'better_symlink_highlighting' into update_highlighting ... Conflicts: syntax/nerdtree.vim		2014-06-29 18:28:28 +01:00
..
nerdtree.vim	Merge branch 'better_symlink_highlighting' into update_highlighting	2014-06-29 18:28:28 +01:00