]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Merge branch 'master' of https://github.com/apple/cups
authorMichael R Sweet <michaelrsweet@gmail.com>
Tue, 20 Sep 2016 17:55:22 +0000 (13:55 -0400)
committerMichael R Sweet <michaelrsweet@gmail.com>
Tue, 20 Sep 2016 17:55:22 +0000 (13:55 -0400)

Trivial merge