From: sethk <sethk@criticalmass.com>
Date: Thu, 14 Apr 2016 14:50:46 +0000 (-0600)
Subject: Merge branch 'issue-7904' of https://github.com/sethkane/foundation-sites into issue... 
X-Git-Tag: v6.2.2-rc1~57^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2b024153197e01c407e67ef5763c9844bc30258;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'issue-7904' of https://github.com/sethkane/foundation-sites into issue-7904

# Conflicts:
#	js/foundation.reveal.js
---

a2b024153197e01c407e67ef5763c9844bc30258