Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 30 Apr 2013 17:35:49 +0000 (13:35 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 30 Apr 2013 17:35:49 +0000 (13:35 -0400)

Trivial merge