Merge branch 'cplusplus:master' into master

Author: diehlpk

.github/ISSUE_TEMPLATE/topic-proposal.md

@@ -3,7 +3,7 @@ name: Topic proposal
 about: Describes a topic that should be considered by SG20 for education guidelines
 title: "[TOPIC-REQUEST]"
 labels: Needs triaging
-assignees: BobSteagall, cjdb, jcvw
+assignees: vulder, jcvw
 
 ---
 

sources/Makefile

@@ -115,7 +115,7 @@ knowledge_areas_summary.md: $(SOURCES) knowledge_areas.dat
 	$(MAKE_MARKDOWN) < knowledge_areas.dat > knowledge_areas_summary.md
 
 contributors.md:
-	git log --all --pretty="%aN" | sort | uniq > contributors.md
+	git log --format="%aN%n%(trailers:key=Co-authored-by,valueonly=true)" | sed 's/ <.*>//g' | sort | uniq > contributors.md
 
 ################################################################################
 # Establish Pandoc settings.