Merge branch 'feature/highlightjs-clojure' of https://github.com/eightysteele/reveal.js
authorhakimel <hakim.elhattab@gmail.com>
Wed, 23 Jan 2013 20:27:55 +0000 (15:27 -0500)
committerhakimel <hakim.elhattab@gmail.com>
Wed, 23 Jan 2013 20:27:55 +0000 (15:27 -0500)

Trivial merge