Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 1 Jun 2010 00:46:32 +0000 (20:46 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 1 Jun 2010 00:46:32 +0000 (20:46 -0400)
commiteb8d06b3b61b8a9099fd6782b322880b6fc6013a
tree3a14bee89d643d455692c3de12894bbdee237c19
parent1b6aa2276e22be2fa7adbca07545f87e248eaf2d
parent1cac22523718596a272ecf39c1ba309306f0177b
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info