From: Kevin Ball <kmball11@gmail.com>
Date: Thu, 25 Feb 2016 01:19:11 +0000 (-0800)
Subject: Merge branch '6.2-stable' into develop
X-Git-Tag: v6.2.1~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=170850b6f1b950e200d6f25d995099ad8efcc09e;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch '6.2-stable' into develop
---

170850b6f1b950e200d6f25d995099ad8efcc09e