Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 30 Apr 2010 18:10:17 +0000 (14:10 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 30 Apr 2010 18:10:17 +0000 (14:10 -0400)

Trivial merge