From: Joey Hess <joey@kitenet.net>
Date: Wed, 7 Dec 2011 18:56:30 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111229~60
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/97363d7e9a0f3daa71ee6a54f8325386f9617a7f?hp=4ff23d3712dcda0ecfd23c7c22dc6a35de1e39d8

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 9b7375e45..2f173677b 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -168,5 +168,6 @@ module vc_Mux2 #( parameter W = 1 )
 endmodule
 """]]
 
+#<asd>
 
 This is simple enough for now [[sandbocen]] no?