Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 27 Jul 2009 07:35:49 +0000 (09:35 +0200)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 27 Jul 2009 07:35:49 +0000 (09:35 +0200)
commit019329817761c2c594e97cf20258c48096f28116
tree0f4e390fff5d27e1db14c8c5a2528373620f9450
parent31865519fd734eab0ac8147e58d52f60cef68946
parent4b80bb5f9c43919fb86fd4c144280ac9246d20c8
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info