Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 31 May 2011 20:24:13 +0000 (16:24 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 31 May 2011 20:24:13 +0000 (16:24 -0400)
commita24c0c543d4e4111dc206813889558bd5376fc8e
tree30c4b30edc66245a2226250dbf12ce20141c374f
parentdac4f405b2f2e0e499131dba3dfa7308729ab980
parent8fcbb59cd84af119bf4ede71305235da99150c5b
Merge branch 'master' of ssh://git.ikiwiki.info