Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 11 Oct 2009 20:53:07 +0000 (16:53 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 11 Oct 2009 20:53:07 +0000 (16:53 -0400)
commit665da89c270f98e93b1eaa89e729f3975973ab8f
treef2f40184469e9d19f92347c94ac5fa6b92226324
parente1939185d29e1431861e63d6526cb3a498d6033e
parent22ed3f388b6433c512ca7a026d868861ea1990ea
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info