Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 17 Jan 2009 03:39:46 +0000 (22:39 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 17 Jan 2009 03:39:46 +0000 (22:39 -0500)
commit0993933ea30f4fb28402f12a033cdd37015da427
tree2f54c651fceedcdbd5c7f3dfc26e6bfccc2d5a60
parent7ee92cab4095fb22d77a0b0100a472c6901eb519
parentadd31f048cc702e7bae3e950c72243eba9322cf0
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info