Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 2 Jan 2008 00:10:21 +0000 (19:10 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 2 Jan 2008 00:10:21 +0000 (19:10 -0500)
commit93a3707e9bedfa0f5f89e2b4419a10f7c8956691
tree8a13b6bd3ffa0600d462cc7c24199d50fa0f4923
parent2269cfda301f0187d41b7b42e5f57f5783afdc11
parent0c26e5027d7d89cd07a0c8d110a69003019f5016
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info