Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 17 Sep 2008 22:13:09 +0000 (18:13 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 17 Sep 2008 22:13:09 +0000 (18:13 -0400)
commit18d086dde871210c7cc9ca754b9ee3297306a676
treec812b7a8d01d2f21ae173a7337c9f46486db13c3
parent89953e3e19d3e5fb0f5c9d47e3905fde27ab08cb
parent39fc9a37dad196ecc2e36a64d17dbbd79c1224f2
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info