Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts: index.html
2013-03-24 17:59:23 +00:00 · 2013-03-24 17:59:23 +00:00 · 3b375ee191
commit 3b375ee191
parent 2389edc8ee 4b13be2503
1 changed files with 1 additions and 1 deletions
--- a/index.html
+++ b/index.html
@ -140,4 +140,4 @@
 	<textarea id="wmd-input"></textarea>
 	<div id="wmd-preview" class="well"></div>
 </body>
-</html>
+</html>