Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 9 Jan 2012 14:34:23 +0000 (10:34 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 9 Jan 2012 14:34:23 +0000 (10:34 -0400)

Trivial merge