From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 14 Mar 2010 17:16:12 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100403~165
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c944bffe3dbad0746880a0cd573808f04505ebdd?hp=30c30a0cdde44491370a1e5a0ef371a4f92c4965

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---

diff --git a/doc/sandbox/prova_blog.html b/doc/sandbox/prova_blog.html
new file mode 100644
index 000000000..d69937ea8
--- /dev/null
+++ b/doc/sandbox/prova_blog.html
@@ -0,0 +1,8 @@
+Questa è una prova.
+Vediamo se funziona
+
+<pre>
+#!/bin/bash
+
+echo "ciao"
+</pre>