Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 23 Jan 2013 23:53:02 +0000 (10:53 +1100)
committerJoey Hess <joey@kitenet.net>
Wed, 23 Jan 2013 23:53:02 +0000 (10:53 +1100)

Trivial merge