From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 1 Jul 2008 22:41:47 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info into tova
X-Git-Tag: 2.52~14^2~9
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/96da041907bcd4e74be6b2beef06d265708644ee

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info into tova
---

96da041907bcd4e74be6b2beef06d265708644ee