From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 3 Jan 2010 19:12:39 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100122~77
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2ffa1a31ba0c3009ee5e1c158ba6b455d4cc7e9c?ds=inline;hp=-c

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

2ffa1a31ba0c3009ee5e1c158ba6b455d4cc7e9c