Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 14 May 2008 06:42:38 +0000 (02:42 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 14 May 2008 06:42:38 +0000 (02:42 -0400)
commit6983e05e8f9f6188b537e2ea1add5120752d9025
treed559eef22f7f67d718836fca0f2c1b42992bee13
parent2c6f41e59c8c4e790559e5171cb0e2aeda919b3b
parent62ac574b362baa40960d56c1f07ce197c4fba4b6
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info