From: Brian Warner <warner@lothar.com>
Date: Thu, 20 Dec 2018 21:01:37 +0000 (-0500)
Subject: Merge branch 'edition-2018'
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=aa9674bbc150bac4352b80382724daf052072c8c;p=PAKEs.git

Merge branch 'edition-2018'
---

aa9674bbc150bac4352b80382724daf052072c8c