From: Lisa Marie Maginnis <lisam@fsf.org>
Date: Mon, 30 Jun 2014 04:22:06 +0000 (-0400)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dd22ce02cc707a63be16d53517b0c94026faab4b;p=enc-live.git

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

dd22ce02cc707a63be16d53517b0c94026faab4b