From: Zak Rogoff <zak@fsf.org>
Date: Wed, 18 Jun 2014 19:50:04 +0000 (-0400)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=17b275edda0eece7889941bef9585aff6f98fb09;p=enc-live.git

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

17b275edda0eece7889941bef9585aff6f98fb09