Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 1 Oct 2008 18:47:49 +0000 (14:47 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 1 Oct 2008 18:47:49 +0000 (14:47 -0400)
commit7308f3da5bf2518f5a9659c7de6212ed5648f27b
tree936d32ce3678e49588325d836af29604af1ddf62
parent872e7425e49742e4f89de547f392d74575aac800
parente21b190be2b306823950ca98e228417bf655f833
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info