merge notes float fix and support for multiple fragments with same index

author Hakim El Hattab <hakim.elhattab@gmail.com>

Sun, 5 May 2013 22:44:10 +0000 (18:44 -0400)

committer Hakim El Hattab <hakim.elhattab@gmail.com>

Sun, 5 May 2013 22:44:10 +0000 (18:44 -0400)
author Hakim El Hattab <hakim.elhattab@gmail.com>
Sun, 5 May 2013 22:44:10 +0000 (18:44 -0400)
committer Hakim El Hattab <hakim.elhattab@gmail.com>
Sun, 5 May 2013 22:44:10 +0000 (18:44 -0400)
diff --cc js/reveal.js
Simple merge
diff --cc plugin/notes/notes.html
Simple merge
author	Hakim El Hattab <hakim.elhattab@gmail.com>
	Sun, 5 May 2013 22:44:10 +0000 (18:44 -0400)
committer	Hakim El Hattab <hakim.elhattab@gmail.com>
	Sun, 5 May 2013 22:44:10 +0000 (18:44 -0400)
		1	2
js/reveal.js	patch \|	diff1 \|	diff2 \|	blob \| history
plugin/notes/notes.html	patch \|	diff1 \|	diff2 \|	blob \| history