From: Zak Rogoff <atticus@Amdijefri.office.fsf.org>
Date: Wed, 19 Aug 2015 18:45:51 +0000 (-0400)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7e12140805c8440e05306e061438020cb17e4691;p=enc-live.git

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

7e12140805c8440e05306e061438020cb17e4691