From: Eduardo Cataño <socketz@gmail.com>
Date: Tue, 26 Aug 2014 09:09:13 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v5.4.1~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5662%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

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

07e3cbb80d9dab8ac4bb03109622cdfd91d0e234