Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 18 Jan 2010 23:00:21 +0000 (18:00 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 18 Jan 2010 23:00:21 +0000 (18:00 -0500)
commit604afbedd3f07cccf7e64277cafeabd78545e0ae
tree1819e824df0940244d3d55d2f438cfc256036321
parent4a8389825ae0715ba68846881ddc8d25b3f9ccb8
parentbe523e7740339d7884dabfa915c7c2df8c60bf27
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info