From: Brendan Blackwood <elderz@gmail.com>
Date: Tue, 28 Oct 2014 14:15:22 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v5.5.0~75^2~13^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F5980%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge remote-tracking branch 'upstream/master'
---

0ef02aad63cb7889e3ded64f8f8495a3c8749676