Merge branch 'upstream'
[debian/confclerk.git] / debian / confclerk.manpages
1 data/confclerk.1