Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 19 Apr 2011 21:47:40 +0000 (17:47 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 19 Apr 2011 21:47:40 +0000 (17:47 -0400)

Trivial merge