Merge branch 'emailauth'
authorJoey Hess <joeyh@joeyh.name>
Thu, 14 May 2015 03:38:56 +0000 (23:38 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 14 May 2015 03:38:56 +0000 (23:38 -0400)
commitcfb2c22906f41d4a4dd1c3404e8e430a35c1cd41
treeb2f0271a5fa334530b3ac3051ad42bc02172a708
parentee2905ae0a2786fd5f195fdc1779a34b5f62c1d9
parentbf8b7fe2d1602827f7419521d140bac4be6200a8
Merge branch 'emailauth'