Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 17 May 2010 19:42:44 +0000 (15:42 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 17 May 2010 19:42:44 +0000 (15:42 -0400)
commita5f0fc4931ab3635aac6bea600a68c8bb05156fc
treedeac8d57af4822c65ae51530474c27f2d14ba380
parent5e515605749684f5867857885043b4e25378a374
parentf864b74859d8b0197f59d7dfe7d45063dc887cd1
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info