Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 2 Mar 2008 23:09:27 +0000 (18:09 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 2 Mar 2008 23:09:27 +0000 (18:09 -0500)
commit18fa785bc62373cb8cd2147317f3f57a17c962ce
tree86c34307da59b4f4d364d8b32cc9ac9fd5b38098
parent5357eeb13cae7a9d6db35d0d8d5b2824a2159780
parent7eeafb3ef95cada7fdff50a6aa0b3f83af96977e
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info