Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Mon, 28 Sep 2009 00:57:45 +0000 (20:57 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Mon, 28 Sep 2009 00:57:45 +0000 (20:57 -0400)
commit13b525d8eab91e197b8f356c3efb9719513c5983
tree11cf741d5d0ccabaaac9ad7c3d62cd0769f1434a
parent7cb620d0e8ed922184d3f1cc38d849665cf8d742
parent6c418c284877f5ddf4795594bc9ac43de63de9cb
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info