key content
Merge branch 'master' of github.com:vanicat/mr-config

Conflicts:
	.config/mr/available.d/travail.git-annex