From: Michael R Sweet <michaelrsweet@gmail.com>
Date: Mon, 11 Apr 2016 21:16:32 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/apple/cups
X-Git-Tag: v2.2b1~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0c14d0a5141f6bc22a3ebb605d26319a52c86bb;p=thirdparty%2Fcups.git

Merge branch 'master' of https://github.com/apple/cups
---

b0c14d0a5141f6bc22a3ebb605d26319a52c86bb