Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
commit331430fe9f092cd00db316a1b35c5fe8b42d036d
authorJoey Hess <joey@kitenet.net>
Mon, 18 Apr 2011 00:59:28 +0000 (17 20:59 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 18 Apr 2011 00:59:28 +0000 (17 20:59 -0400)
treeb599515cd1632e09de5c6633801a758e006923e5
parentdf81a2d208faef7d8fb59b0669e7018e099b6be6
parentd238af908b8b6fd6a185a0eda07af1858feffe19
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info