Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 4 Mar 2013 22:32:40 +0000 (18:32 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 4 Mar 2013 22:32:40 +0000 (18:32 -0400)

Trivial merge