From: Joey Hess <joey@kitenet.net>
Date: Sun, 26 Dec 2010 17:55:35 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20101231~26
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/58e854555a5af63c811185e1196fee950ea2f58d

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

58e854555a5af63c811185e1196fee950ea2f58d