Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Sun, 15 Jun 2008 19:05:15 +0000 (15:05 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sun, 15 Jun 2008 19:05:15 +0000 (15:05 -0400)
commitc915ff6953f508454000767ad4ca3d0a0428b5bf
tree82ae8cbc736f3f759a43ecbe86688ab51cb3fed3
parenta6a2010944e08f8dd7bc6df48ea3844f09dc42eb
parent163ffb3fe94c47f0617dfe04083e69c730c2f712
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info