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

Trivial merge