Merge branch 'master' of file:///srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 19 Nov 2008 22:31:32 +0000 (17:31 -0500)
committerJoey Hess <joey@kitenet.net>
Wed, 19 Nov 2008 22:31:32 +0000 (17:31 -0500)
commite1a89e219a202fceffb0de5add8377da1a754d3b
tree541469547d781b348d9fae9df2c14f16ae75c3e2
parent903b7ff5ae020dfd240156957100a2cd3b4c3806
parent276b814bb9f53291f1ebe1cc510d49f1ba4719c8
Merge branch 'master' of file:///srv/git/ikiwiki.info