Merge branch 'bugfix-pause' of https://github.com/EverythingMe/reveal.js into dev
authorHakim El Hattab <hakim.elhattab@gmail.com>
Sun, 17 Mar 2013 12:14:45 +0000 (08:14 -0400)
committerHakim El Hattab <hakim.elhattab@gmail.com>
Sun, 17 Mar 2013 12:14:45 +0000 (08:14 -0400)
1  2 
js/reveal.js

diff --cc js/reveal.js
Simple merge