From: Joey Hess <joey@kitenet.net>
Date: Sun, 8 Apr 2012 18:17:29 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120419~53
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8cdbe23435d6a027d25c106c00ba34665fd54ed1?hp=-c

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

8cdbe23435d6a027d25c106c00ba34665fd54ed1