Merge branch 'master' of /usr/local/www/ikiwiki-srcdir
authorChris Turner <cat@leaf.dragonflybsd.org>
Mon, 8 Nov 2010 03:10:42 +0000 (19:10 -0800)
committerChris Turner <cat@leaf.dragonflybsd.org>
Mon, 8 Nov 2010 03:10:42 +0000 (19:10 -0800)

Trivial merge