From: Joey Hess <joey@kitenet.net>
Date: Mon, 24 Jan 2011 21:02:11 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110124~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/930682fcffa45a924edcff971985486d83b90105

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

930682fcffa45a924edcff971985486d83b90105