Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 5 May 2011 20:23:47 +0000 (16:23 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 5 May 2011 20:23:47 +0000 (16:23 -0400)

Trivial merge