Merge branch 'master' of /usr/local/www/ikiwiki-repo
authorJustin C. Sherrill <justin@leaf.dragonflybsd.org>
Mon, 14 Dec 2009 03:24:36 +0000 (19:24 -0800)
committerJustin C. Sherrill <justin@leaf.dragonflybsd.org>
Mon, 14 Dec 2009 03:24:36 +0000 (19:24 -0800)

Trivial merge