commit 60c3beb6933cfa88d21b4e1120ec540a1cc77dde
Merge: 50f881cd 497514e3
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sun Jan 21 02:44:07 2018 -0500
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Sun Jan 21 02:44:07 2018 -0500

    Merge branch 'master' of github.com:chocolate-doom/chocolate-doom

 Makefile.am                     |  2 ++
 man/Makefile.am                 | 16 +++++++++-------
 man/bash-completion/Makefile.am |  2 +-
 man/server.template             |  2 +-
 man/strife.template             |  2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)