Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 21 Feb 2012 17:34:13 +0000 (13:34 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 21 Feb 2012 17:34:13 +0000 (13:34 -0400)

Trivial merge