Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 28 Mar 2010 22:49:22 +0000 (18:49 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 28 Mar 2010 22:49:22 +0000 (18:49 -0400)
commit2bbbc906bae7aa81b2635ca33f6e880f9a5ae9f5
treeb6db65f2dcbac6d3067095eafc52df279442dca4
parent911533655186f7c43ac229a4cdbc5be3e7f80d49
parent02e6ec9dd2c5e1e260a1f18406942059fe3d2064
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info