From: hakimel <hakim.elhattab@gmail.com>
Date: Wed, 23 Jan 2013 20:27:55 +0000 (-0500)
Subject: Merge branch 'feature/highlightjs-clojure' of https://github.com/eightysteele/reveal.js
X-Git-Tag: 2.2.0~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3f140ef50e854c1d39a562065fbbcd053a4e6f4d;p=reveal.js.git

Merge branch 'feature/highlightjs-clojure' of https://github.com/eightysteele/reveal.js
---

3f140ef50e854c1d39a562065fbbcd053a4e6f4d