From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Thu, 1 Apr 2021 18:11:54 +0000 (-0400)
Subject: Merge branch 'master' into ipptool
X-Git-Tag: v2.4b1~163^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d374fafccb9ec1f633d42d0c2254580bb6a17f30;p=thirdparty%2Fcups.git

Merge branch 'master' into ipptool
---

d374fafccb9ec1f633d42d0c2254580bb6a17f30