Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 8 Feb 2008 18:49:14 +0000 (13:49 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 8 Feb 2008 18:49:14 +0000 (13:49 -0500)
commit8116a172308313be528ddefd4039c3971cf6fca2
treee6fa488b2ef5f8690f6b532ad1adcd2778b17cec
parent63e316f3621618f3b190da527fbb62ca5dad45d9
parent35547272c66880db73ac2791ac6ce8d58752ebad
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info