From: Zak Rogoff <atticus@Amdijefri.office.fsf.org>
Date: Tue, 18 Aug 2015 20:25:53 +0000 (-0400)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0937b0266cc539f175fcb0b2131961eebd8f975f;p=enc-live.git

Merge branch 'master' of vcs.fsf.org:enc
---

0937b0266cc539f175fcb0b2131961eebd8f975f