Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 3 Aug 2008 21:50:22 +0000 (17:50 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 3 Aug 2008 21:50:22 +0000 (17:50 -0400)
commit3baa1742f326bd0324a47b56bd39e96ebf625619
tree4f821551580e60e33eb0c6559fd63493d2b8b490
parent1bf35bd2e74a5464a249cc1b724f484dee841fa3
parentca5f64c4ef85dc0e5187f80f3f108b623ac01470
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info