Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 14 Nov 2007 14:27:45 +0000 (09:27 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 14 Nov 2007 14:27:45 +0000 (09:27 -0500)
commit4db40b4e59c1e735e4176f3e82b825e895306c4c
tree9153eb779c632d7b99d5702202ec8dca4707c5b2
parentcb80809aec56e1b6f0194f3d6f778fc8db3c7783
parent9905bb999aaf6c8093b0e0562619ff97d78506b1
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info