before merge
merged
merged
commit
new
hoge
hoge co
singlecompile
Merge branch 'hoge' of github.com:akiniwa/dotfiles into hoge

Conflicts:
	.vim/bundle/SingleCompile
	.vim/bundle/neocomplcache
	.vimrc.neobundle