Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 27 Sep 2010 02:27:50 +0000 (22:27 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 27 Sep 2010 02:27:50 +0000 (22:27 -0400)
commite789cb9c84ba22570de18ff530c428c6fbe56e77
treec089d4bb3e039cbf028acdebc0625c030914e66b
parent1883e31de2044eba87035c7bbb4b34c45fefa432
parent759260f7c836f3491d4250e77aea2c14ad9369b5
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info