Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 24 Feb 2008 22:01:59 +0000 (17:01 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 24 Feb 2008 22:01:59 +0000 (17:01 -0500)
commitfab5151a865cd5124c8ac378c48b01ccc4469a8e
treedae39aa1c0ec8148773713b85753ce8f378316a1
parent265098501e4459d6f5ea365539b577681afc37e6
parent031bb8cef3dd08d37f0ed66f4cadb431a4b2f3ed
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info