Merge branch 'master' of https://github.com/theoreticaLee/reveal.js into dev
authorHakim El Hattab <hakim.elhattab@gmail.com>
Sun, 31 Mar 2013 01:58:03 +0000 (21:58 -0400)
committerHakim El Hattab <hakim.elhattab@gmail.com>
Sun, 31 Mar 2013 01:58:03 +0000 (21:58 -0400)
1  2 
package.json

diff --cc package.json
Simple merge