Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 2 May 2010 19:45:48 +0000 (15:45 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 2 May 2010 19:45:48 +0000 (15:45 -0400)
commitcbe0726b6345bceed3ebc7fbd5ea2454dce63b15
tree3c65e93c57d7c6a63b5f38d0c379a84354e3bbdb
parent0aad1794ad27da6ab41001e335eba952c2e0ac88
parent9480dc44277ad9301f1e1eba5b09990b459e7b26
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info