From: Dave Gandy <dave@davegandy.com>
Date: Mon, 24 Oct 2016 15:42:21 +0000 (-0400)
Subject: Merge branch 'master' into 4.7.0
X-Git-Tag: v4.7.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10012%2Fhead;p=thirdparty%2FFont-Awesome.git

Merge branch 'master' into 4.7.0
---

9fe5852ce8e9a3ccc12465da41dac13901abf381