From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Feb 2011 03:50:15 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110225~42
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4524853fa741b0c164211a38d95c549062b3c3f1?hp=8a1fcd5a5ab43d91e14c521dce1dcd8ae59a4946

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 59daa033a..4aa1401b3 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -7,7 +7,7 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki
 
 
 ## Blockquotes
-hjfjjjfkkkf
+
 > This is a blockquote.
 >
 > This is the first level of quoting.
@@ -19,6 +19,11 @@ hjfjjjfkkkf
 >
 > Back to the first level.
 
+> It's kinda like e-mail...
+>> ...but without the cool colored lines...
+>>> ...and different font colors.
+>>>> ...but it's nothing a little CSS can't fix.
+
 Numbered list 
 
 1. First item.