From: Dave Thompson <davet@freestation00.office.fsf.org>
Date: Wed, 4 Jun 2014 21:49:02 +0000 (-0400)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cbacb0476afa805b879d03901b17b18578d73e8e;p=enc-live.git

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

cbacb0476afa805b879d03901b17b18578d73e8e