From: Joey Hess <joey@kitenet.net>
Date: Tue, 9 Oct 2012 14:50:37 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20121016~12
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4c1582c11eb85bf356c943abf1b31dde3453e73d

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

4c1582c11eb85bf356c943abf1b31dde3453e73d