From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 5 Feb 2008 18:50:32 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
X-Git-Tag: 2.31~13
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/94fb13503367f7929be7cc31db0cea98ade60f90

Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info
---

94fb13503367f7929be7cc31db0cea98ade60f90