-2014-03-08 18:16:33
Merge branch 'master' of github.com:qingu/dotvim

Conflicts:
	.zshrc