Snapshot 68
Merge branch 'master' of git://github.com/b4winckler/macvim

Conflicts:
	src/MacVim/Info.plist