Merge branch 'master' of https://github.com/functino/reveal.js
authorHakim El Hattab <hakim.elhattab@gmail.com>
Sat, 13 Oct 2012 15:44:54 +0000 (11:44 -0400)
committerHakim El Hattab <hakim.elhattab@gmail.com>
Sat, 13 Oct 2012 15:44:54 +0000 (11:44 -0400)
1  2 
README.md
js/reveal.js

diff --cc README.md
Simple merge
diff --cc js/reveal.js
Simple merge