Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 13 Feb 2012 15:43:39 +0000 (11:43 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 13 Feb 2012 15:43:39 +0000 (11:43 -0400)
commit021521ffc82497b2c8148bb948e6b682f85d2bce
treeb1e6335c9fff760f703b966772ce94207206eef7
parent2717d9774a2214f936af4e9e74f10181e6a9c027
parente3304d234d59a5124ec94ea91161a80cfd3078e0
Merge branch 'master' of ssh://git.ikiwiki.info