From: Michael R Sweet <michaelrsweet@gmail.com>
Date: Sat, 1 Oct 2016 19:03:28 +0000 (-0400)
Subject: Merge pull request #4887 from jschwender/patch-3
X-Git-Tag: v2.2.1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83afb9612c1e8fa21f9184dfd84eb0841c7885fd;p=thirdparty%2Fcups.git

Merge pull request #4887 from jschwender/patch-3

Update CREDITS.txt
---

83afb9612c1e8fa21f9184dfd84eb0841c7885fd