Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 12 Feb 2008 22:41:01 +0000 (17:41 -0500)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 12 Feb 2008 22:41:01 +0000 (17:41 -0500)
commit14cdc430838fd5c8e61319d1cb229e601241bb92
tree9f5a71a53c8199fc2a5f18745b00582c7c8be861
parent49adc59474027390eb53eb749a7bc95492142582
parentc23abb3553cf03e9b85aff0e9a6cc8e1c55acde5
Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info