From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Jan 2009 17:29:18 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.02~60
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f01a5c9df70ad1e001685dc24b8d2cd2df0d05af?hp=551544663db939c8eb32dd78ad74e1514589be25

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

diff --git a/doc/examples/softwaresite/bugs/test1.mdwn b/doc/examples/softwaresite/bugs/test1.mdwn
new file mode 100644
index 000000000..00fd786fc
--- /dev/null
+++ b/doc/examples/softwaresite/bugs/test1.mdwn
@@ -0,0 +1,2 @@
+blah blah blah
+
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 582d46e84..92899ea47 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -2,6 +2,7 @@ This is the SandBox, a page anyone can edit to try out ikiwiki.
 
 testing 1..2..3!!
 
+[[한글페이지]]
 ----
 
 Here's a paragraph.
@@ -83,3 +84,6 @@ The haiku will change after every save, mind you.
 This SandBox is also a [[blog]]!
 
 [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]]
+
+-----
+[[한글]]
diff --git "a/doc/sandbox/\355\225\234\352\270\200.mdwn" "b/doc/sandbox/\355\225\234\352\270\200.mdwn"
new file mode 100644
index 000000000..e0ba32639
--- /dev/null
+++ "b/doc/sandbox/\355\225\234\352\270\200.mdwn"
@@ -0,0 +1 @@
+~를 어떻게 할까~
diff --git "a/doc/sandbox/\355\225\234\352\270\200\355\216\230\354\235\264\354\247\200.mdwn" "b/doc/sandbox/\355\225\234\352\270\200\355\216\230\354\235\264\354\247\200.mdwn"
new file mode 100644
index 000000000..4fac7976c
--- /dev/null
+++ "b/doc/sandbox/\355\225\234\352\270\200\355\216\230\354\235\264\354\247\200.mdwn"
@@ -0,0 +1,2 @@
+
+Wow test