From: Dave Gandy <dave@davegandy.com>
Date: Tue, 11 Oct 2016 17:11:08 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/ad-proxy' into 4.7.0
X-Git-Tag: v4.7.0~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccd56161b2b1beab79b440a8250a34e498c4d552;p=thirdparty%2FFont-Awesome.git

Merge remote-tracking branch 'origin/ad-proxy' into 4.7.0
---

ccd56161b2b1beab79b440a8250a34e498c4d552