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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0a788f35bd69411e4ee536903fd8acc7a8580452..2a83777e6574ec74e9ebb878f0964a88b0118639 100644 (file)
--- 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 (file)
index e416c23..0000000
--- 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.