Merge branch 'master' of vcs.fsf.org:enc
authorAdam Leibson <adaml@fsf.org>
Wed, 19 Aug 2015 18:47:27 +0000 (14:47 -0400)
committerAdam Leibson <adaml@fsf.org>
Wed, 19 Aug 2015 18:47:27 +0000 (14:47 -0400)
Conflicts:
en/workshops.html


Trivial merge