Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 27 Sep 2012 23:03:20 +0000 (19:03 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 27 Sep 2012 23:03:20 +0000 (19:03 -0400)
commit1a362c7912156eb3d34663361b4659a22bfc2cf6
tree5c151083d043b262052e8829378c77715cb5fcc2
parentf4d1f6f8daac6e74dba17aabf76a2e576362108c
parent2fedc701c9eb0d34c229ed0532112d35b593e561
Merge branch 'master' of ssh://git.ikiwiki.info