Merge branch 'master' of github.com:hakimel/reveal.js into notes
authorHakim El Hattab <hakim.elhattab@gmail.com>
Tue, 10 Jul 2012 00:39:23 +0000 (20:39 -0400)
committerHakim El Hattab <hakim.elhattab@gmail.com>
Tue, 10 Jul 2012 00:39:23 +0000 (20:39 -0400)
1  2 
css/main.css

diff --cc css/main.css
Simple merge