Automatic merge (git-subtree add/merge) by /usr/share/gitted/export/git-subtree on alhena
Merge commit 'dd426b82cfbe4bfbbfc08f8ca5856ec83d1c5831'

Conflicts:
	sysconf/sysconf.metagitted/README.md