Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 14 Sep 2010 19:13:13 +0000 (15:13 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 14 Sep 2010 19:13:13 +0000 (15:13 -0400)

Trivial merge