From: perryst5 <perryst5@gmail.com>
Date: Mon, 2 Mar 2015 02:38:54 +0000 (-0500)
Subject: Merge pull request #1 from perryst5/perryst5-patch-1
X-Git-Tag: v5.5.2~70^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6343%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge pull request #1 from perryst5/perryst5-patch-1

Fix merge conflict
---

75eb0fd8190bb462667f75e7bd64b9d6c0ee9a8a