Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 17 Mar 2011 21:09:39 +0000 (17:09 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 17 Mar 2011 21:09:39 +0000 (17:09 -0400)

Trivial merge