Old-style .gitconfig
Old-style .gitconfig
Merge branch 'gitconf-old' of https://github.com/l0b0/tilde into gitconf-old
Merge branch 'gitconf-old' of https://github.com/l0b0/tilde into gitconf-old

Conflicts:
	.gitconfig