Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 21 Sep 2008 00:06:54 +0000 (20:06 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 21 Sep 2008 00:06:54 +0000 (20:06 -0400)
commitc0d7c60b9f94b3f2927cd8484991e33190cd84cd
treee8940ab3b4d7bb71558e3b01465019c5cc3d0b8b
parent748d3759540b74a6faca5cad4f23b07527315f04
parentf08189c7fa1e81efdcf411223ac558b2f55bda10
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info