From: Joey Hess <joey@kitenet.net>
Date: Sat, 30 Oct 2010 16:42:10 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20101112~47
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0bfcc8da5d769ff4ba9425a99d2c495175ea685e

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

0bfcc8da5d769ff4ba9425a99d2c495175ea685e