Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info 2.30
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 2 Feb 2008 22:51:47 +0000 (17:51 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 2 Feb 2008 22:51:47 +0000 (17:51 -0500)
commit05e180096c6ef808ab16cce4922595eeca9b9b25
tree8f7d2e8d6de0fda72bf74ba3f6c6df54aba48f9a
parente3c21fd5e887c8eb21e33bddbf7c7c5b1a0e6f10
parent3e085d938aa35cc62a910493ad5ec44455883eec
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info