Merge branch 'master' into do-fallback-without-mediacol

author Till Kamppeter <till.kamppeter@gmail.com>

Fri, 29 Nov 2019 19:09:47 +0000 (20:09 +0100)

committer GitHub <noreply@github.com>

Fri, 29 Nov 2019 19:09:47 +0000 (20:09 +0100)
author Till Kamppeter <till.kamppeter@gmail.com>
Fri, 29 Nov 2019 19:09:47 +0000 (20:09 +0100)
committer GitHub <noreply@github.com>
Fri, 29 Nov 2019 19:09:47 +0000 (20:09 +0100)
diff --cc backend/implicitclass.c
Simple merge
diff --cc utils/cups-browsed.c
Simple merge
author	Till Kamppeter <till.kamppeter@gmail.com>
	Fri, 29 Nov 2019 19:09:47 +0000 (20:09 +0100)
committer	GitHub <noreply@github.com>
	Fri, 29 Nov 2019 19:09:47 +0000 (20:09 +0100)
		1	2
backend/implicitclass.c	patch \|	diff1 \|	diff2 \|	blob \| history
utils/cups-browsed.c	patch \|	diff1 \|	diff2 \|	blob \| history