Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 16 Nov 2007 17:53:34 +0000 (12:53 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 16 Nov 2007 17:53:34 +0000 (12:53 -0500)
commit90baead73f1f6ad4e6a88df15069a480cd073fde
tree058686d062f572f44cfee41ea46e6964fd2c98fd
parent90b83ee32ac0d07f7f1421bc20d1704e847673f6
parentd29c485a8c8c0e75c8622ef5050b327180ad632c
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info