Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 7 Jan 2008 21:40:45 +0000 (16:40 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 7 Jan 2008 21:40:45 +0000 (16:40 -0500)
commit08cb5f7badff3fdb103cf84890b19b90c0600a4e
tree0e6ff3f76fdab09377f02eedc74adc85194d190f
parentdcf342f366706880e89bb5178c568094d05b21c4
parentcaa68884c7c057fcdd88a517f48bb945c9b7c69c
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info