Merge branch 'stable' of ssh://vcs.fsf.org/libreplanet-static into stable

author Bambi <bambi@boris>

Wed, 8 Jan 2020 21:55:17 +0000 (16:55 -0500)

committer Bambi <bambi@boris>

Wed, 8 Jan 2020 21:55:17 +0000 (16:55 -0500)
author Bambi <bambi@boris>
Wed, 8 Jan 2020 21:55:17 +0000 (16:55 -0500)
committer Bambi <bambi@boris>
Wed, 8 Jan 2020 21:55:17 +0000 (16:55 -0500)
diff --cc 2019/Makefile
Simple merge
diff --cc 2019/README.md
Simple merge
		1	2
2019/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
2019/README.md	patch \|	diff1 \|	diff2 \|	blob \| history