Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 10 Feb 2008 23:02:18 +0000 (18:02 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 10 Feb 2008 23:02:18 +0000 (18:02 -0500)
commit598d604fa8aaa65f75bec61250f97df683a9cf3b
treed2e25aa9dffec9fc521d5e22f86a1a87263a4991
parent11a781d1c5d614b12b2f358faf5be9951b62ae37
parentec9d3ab549fc40b23db7fa912338e4e7c24ebb4c
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info