Merge branch 'master' of git://github.com/wking/ikiwiki
authorJoey Hess <joey@kitenet.net>
Wed, 10 Oct 2012 14:43:36 +0000 (10:43 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 10 Oct 2012 14:43:36 +0000 (10:43 -0400)

Trivial merge