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

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

a3e8b37b159ddbbeebec03d86fa81c493532d9e8