Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 12 May 2008 21:06:10 +0000 (17:06 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 12 May 2008 21:06:10 +0000 (17:06 -0400)
commit30746d12a5e88e9324f8506cd1eafab1694ba651
tree64223bb705aea1271289fdd8314a937140899041
parent341651a5d83f5464e14d8457d74fbfc23956948d
parentbafb2d7b8199977556eed9a630f2a898b6400dfe
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info