Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 5 Aug 2011 14:13:46 +0000 (10:13 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 5 Aug 2011 14:13:46 +0000 (10:13 -0400)

Trivial merge