Merge remote-tracking branch 'anarcat/dev/syslog_utf8'
authorJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:09:51 +0000 (14:09 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:09:51 +0000 (14:09 -0400)
1  2 
IkiWiki.pm

diff --cc IkiWiki.pm
Simple merge