Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 19 Apr 2012 19:45:13 +0000 (15:45 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 19 Apr 2012 19:45:13 +0000 (15:45 -0400)

Trivial merge