From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 15 Mar 2009 21:40:37 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.08~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1d9762c57ce10b455aa337d083afb670b50b6b61

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

1d9762c57ce10b455aa337d083afb670b50b6b61