From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 3 Feb 2008 04:41:33 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.31~60
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/06841ed6b3559ea6c2ef37f80e7676b7181492a1?hp=6a7c3d1209ab15094c390fe56da0e5d56220c555

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

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index a5c44f109..bb9b2fc53 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -12,6 +12,8 @@ Hupple hupple hupple hupple snork.
 
 There are Polish diacritical characters: ą, ć, ę, ł, ń, ó, ś, ż, ź.
 
+Korean characters test : 한글테스트입니다.
+
 # Header
 
 ## Subheader
@@ -71,3 +73,7 @@ Bulleted list
 This sandbox is also a [[ikiwiki/blog]]!
 
 [[inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+
+-----
+
+This is a test of the emergency broadcast system...
diff --git a/doc/sandbox/testsubpage.mdwn b/doc/sandbox/testsubpage.mdwn
new file mode 100644
index 000000000..3db7aaaab
--- /dev/null
+++ b/doc/sandbox/testsubpage.mdwn
@@ -0,0 +1,3 @@
+# Test subpage
+
+This is a test subpage. Isn't that special?