From: Adam Leibson <adaml@fsf.org>
Date: Wed, 19 Aug 2015 18:47:27 +0000 (-0400)
Subject: Merge branch 'master' of vcs.fsf.org:enc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7be5e3faa5edb05ba27f1b09d695d55f1654804f;p=enc-live.git

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

Conflicts:
	en/workshops.html
---

7be5e3faa5edb05ba27f1b09d695d55f1654804f