From: Joey Hess <joey@kitenet.net>
Date: Tue, 1 Mar 2011 16:39:08 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110321~16
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9d3467cf4ac8773589a90a9b28e1e726dc417e6d

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

9d3467cf4ac8773589a90a9b28e1e726dc417e6d