From: Joey Hess <joey@kitenet.net>
Date: Mon, 9 Jan 2012 14:34:23 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120109~1
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d95f6fd87e1dfbec96ba810a67f4fc991c3f31e7?hp=-c

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

d95f6fd87e1dfbec96ba810a67f4fc991c3f31e7