Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 13 Sep 2010 16:49:55 +0000 (12:49 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 13 Sep 2010 16:49:55 +0000 (12:49 -0400)

Trivial merge