Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 19 Oct 2010 06:31:50 +0000 (02:31 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 19 Oct 2010 06:31:50 +0000 (02:31 -0400)
commitecac1e79a69894b78daccbd5b79a21a8dbbb1592
treecbc46726de30620f9b36d3d68067f5e0cbf8e40d
parent9b52fb16be4c5f569c31d339391c46264c6e43af
parent0fe25eb41464095f1511b054f45b885572a13071
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info