From: Hakim El Hattab <hakim@squarespace.com>
Date: Thu, 8 Aug 2013 17:34:24 +0000 (-0400)
Subject: merge master into dev
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc43e905d55634ea819eda8dd67ef9dc89656e12;p=reveal.js.git

merge master into dev
---

fc43e905d55634ea819eda8dd67ef9dc89656e12