Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Jul 2008 00:43:52 +0000 (20:43 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Jul 2008 00:43:52 +0000 (20:43 -0400)
commit27de4c050bee1eb0b164042bf8106a668c538049
treeb7f10c61cf680135db9a8833c617a3cbdb7ffbcf
parent193f1df0af1453164869f9cfe492430369566fff
parent6258aae7b24457a0ad8113f499f46418c268f07e
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info