Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 13 Sep 2009 22:45:45 +0000 (18:45 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 13 Sep 2009 22:45:45 +0000 (18:45 -0400)
commit5e0beca452f7feb019a5d16908b61a233c112c0e
tree93ac6957e007149b5d4ff1b49389c765e6b81f49
parent2b07f393511fd1bfb5fc3f1edbc2d87b061d617d
parentf146bd0cf8f8fb661fe8690cd3246aa6ba6225f4
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info