Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 26 Mar 2013 02:10:39 +0000 (22:10 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 26 Mar 2013 02:10:39 +0000 (22:10 -0400)

Trivial merge