Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 4 Jun 2008 15:30:59 +0000 (11:30 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 4 Jun 2008 15:30:59 +0000 (11:30 -0400)
commita0970423a72a6e687eeb79b660d7609f2539d7b8
treedd8a8884f8ed5a460271ae164f0f697f53c2cbda
parent325fc9d8d03676eab1fdc78e6b65155af0ebcc2b
parentd52dad50d297b63a8659065b85c9243f378895a9
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info