Merge branch 'master' of /usr/local/www/ikiwiki-repo
authorCharlie Root <root@leaf.dragonflybsd.org>
Sat, 30 Nov 2013 04:26:00 +0000 (20:26 -0800)
committerCharlie Root <root@leaf.dragonflybsd.org>
Sat, 30 Nov 2013 04:26:00 +0000 (20:26 -0800)

Trivial merge