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

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

e00dad7cd7e666a5caa971018fcf3fb595f93977