From: Joey Hess <joey@kitenet.net>
Date: Fri, 18 Feb 2011 03:50:15 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110225~42
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4524853fa741b0c164211a38d95c549062b3c3f1

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

4524853fa741b0c164211a38d95c549062b3c3f1