Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 23 Oct 2010 19:02:58 +0000 (15:02 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 23 Oct 2010 19:02:58 +0000 (15:02 -0400)
commit9aaae1b2ded1cf90c570bfb5f8dc61c29f244d6f
tree781714ccb233cc2d832e681322f92a9cb7502916
parent7e8064e9fa8b3f2c3c0bd0aa5458f00552398e06
parent1c8d7c450b6ec1e6bf9973525bf117035b907e98
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info