Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 2 Feb 2011 01:08:32 +0000 (21:08 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 2 Feb 2011 01:08:32 +0000 (21:08 -0400)
commit9ed779b746de86b92a1c08f1b2b4196d42149e55
treed7e93ffb8574c8c396971bda2db8b4fb28e55249
parentb752e7fec4d2bdd788a70722455018245900126b
parent148d18b04276474027a8e0eb537616b55c8103dc
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info