From: Joey Hess <joey@kitenet.net>
Date: Sun, 12 Sep 2010 22:53:40 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100915~18
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/32a12f83f403ca5e1e2bfdb769b73141fab7f603

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

32a12f83f403ca5e1e2bfdb769b73141fab7f603