From: Michael R Sweet <michaelrsweet@gmail.com>
Date: Thu, 17 Mar 2016 23:26:30 +0000 (-0400)
Subject: Merge pull request #4788 from leoarnold/mailmap
X-Git-Tag: v2.2b1~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ef28fe57295474684adb70ea457f3620d0c4eb0;p=thirdparty%2Fcups.git

Merge pull request #4788 from leoarnold/mailmap

Add a mailmap for correct work attribution
---

6ef28fe57295474684adb70ea457f3620d0c4eb0