From: Zachary Yedidia <zyedidia@gmail.com>
Date: Sun, 15 Oct 2017 19:35:54 +0000 (-0400)
Subject: Merge
X-Git-Tag: v1.3.4~26
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=678819683aba24fc8633e091fc271b5ff379ce0e;p=micro.git

Merge
---

678819683aba24fc8633e091fc271b5ff379ce0e