From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 5 Feb 2010 18:46:35 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100212~62
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/919d66b3257a7733049b8ac158ae6c80e0613ef0?hp=-c

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

919d66b3257a7733049b8ac158ae6c80e0613ef0