Merge branch 'master' of https://github.com/hakimel/reveal.js
authorDavid Banham <david@banham.id.au>
Thu, 7 Mar 2013 23:29:54 +0000 (10:29 +1100)
committerDavid Banham <david@banham.id.au>
Thu, 7 Mar 2013 23:29:54 +0000 (10:29 +1100)
commit61c229a4f969a0720085c2710f8a7cfd8a12b4a6
tree637eeedce43c63a6aa004d566944ad791b984e7d
parent26d5febd7f24223900aa50d24d35e610c7c8a334
parent7081f901da553206f746c40c4a0c1b5773697cf2
Merge branch 'master' of https://github.com/hakimel/reveal.js

Conflicts:
README.md
index.html
js/reveal.js
package.json
plugin/speakernotes/client.js
README.md