From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Thu, 2 Feb 2012 03:02:45 +0000 (-0500)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/bd5e75fd6dc7adef3dde52284282655a06a951fe?hp=3e3cb82154d3b984b502ea697e101528cc9bb41e

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0a788f35b..2a83777e6 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1156,7 +1156,7 @@ sub strftime_utf8 {
 	# strftime doesn't know about encodings, so make sure
 	# its output is properly treated as utf8.
 	# Note that this does not handle utf-8 in the format string.
-	$strftime_encoding = POSIX::setlocale(&POSIX::LC_TIME) =~ m#\.([^@]+)#
+	($strftime_encoding) = POSIX::setlocale(&POSIX::LC_TIME) =~ m#\.([^@]+)#
 		unless defined $strftime_encoding;
 	$strftime_encoding
 		? Encode::decode($strftime_encoding, POSIX::strftime(@_))
diff --git a/doc/examples/blog/posts/Test_Post.mdwn b/doc/examples/blog/posts/Test_Post.mdwn
deleted file mode 100644
index e416c235f..000000000
--- a/doc/examples/blog/posts/Test_Post.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-## Test Post
-
-This is a quick test of *ikiwiki*. The quick brown dog jumps over the lazy dog and now is the time for all good men to come to the aid of the party.
-
-### Some More Stuff
-
-And here is a new paragraph.