From: Joey Hess <joey@kitenet.net>
Date: Mon, 20 Sep 2010 00:15:38 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100926~14
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/012300404e86578e24ab3f07ded9f1ba89c39b2a

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

012300404e86578e24ab3f07ded9f1ba89c39b2a