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

Trivial merge