Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 29 Aug 2010 00:21:10 +0000 (20:21 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 29 Aug 2010 00:21:10 +0000 (20:21 -0400)
commitdebdfd45d52d1b200f61d298e0b72a87327d4aae
treecdac52f06ebf176c9b96db5a0e4e6a166f715f2c
parentdecf432fd53d85a81cc4e8904b1ee04d64d6ce3c
parentf398ad035b973608d380c9939ea845d8e2a0cdc2
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info