Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 7 May 2010 17:28:31 +0000 (13:28 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 7 May 2010 17:28:31 +0000 (13:28 -0400)

Trivial merge