From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 14 May 2015 03:38:56 +0000 (-0400)
Subject: Merge branch 'emailauth'
X-Git-Tag: 3.20150610~72
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/cfb2c22906f41d4a4dd1c3404e8e430a35c1cd41

Merge branch 'emailauth'
---

cfb2c22906f41d4a4dd1c3404e8e430a35c1cd41