From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 25 Aug 2008 20:04:18 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 2.62~35
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3cb1c8fa3b1fac58f8a84deef9b72b334c17c97a?ds=sidebyside;hp=-c

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

3cb1c8fa3b1fac58f8a84deef9b72b334c17c97a