]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
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)

Trivial merge