Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 4 Feb 2008 23:36:16 +0000 (18:36 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 4 Feb 2008 23:36:16 +0000 (18:36 -0500)
commitf7c575bd30b2b4a66ca73dedec1984872fdf8372
treee0f302db16ce1290be2dd59fb37623b153783952
parent57567f41680b80799037cc47c60a09c9a9e0e724
parent9f9bc5607edd1d9be81459c4a384a53c4ac45df6
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info