From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 31 Oct 2008 22:00:58 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.68~12
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ac750fcd12f1375d4875d62a889005322aa6f534?ds=inline;hp=--cc

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

ac750fcd12f1375d4875d62a889005322aa6f534