Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 23 Oct 2010 20:19:45 +0000 (16:19 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 23 Oct 2010 20:19:45 +0000 (16:19 -0400)
commitd2359d50cab3647bfec8fc2c3147a9af2c4ecd67
tree90265e209aa76b584de96a1f9202e8e59b94a91e
parent9ca9959eda17ca85ca1550353d09ee33f6bb0469
parentf3820ee8acbbb31a4794039a989d3e642f5c6d2a
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info