Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Fri, 15 May 2009 20:47:55 +0000 (16:47 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 15 May 2009 20:47:55 +0000 (16:47 -0400)
commit3bd1dd598d18e9237b85fc978540b998d8006212
treeaba7d469df8a3ed8e6f45a07613321cc4f7216e9
parent2612595a0c2fef24de733a175e55c9e30455f350
parent8439d20684421388ddee7d7521e64b7257291996
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info