From: RafiBomb <rafi@zurb.com>
Date: Thu, 16 Jun 2016 18:41:17 +0000 (-0700)
Subject: fixes mege conflict
X-Git-Tag: v2.2.0~11
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F483%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-emails.git

fixes mege conflict
---

33289a310e701016ae3cece3a362ae6b986431f3