Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 3 Feb 2012 02:43:25 +0000 (22:43 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 3 Feb 2012 02:43:25 +0000 (22:43 -0400)

Trivial merge