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)
commit7be5e3faa5edb05ba27f1b09d695d55f1654804f
treecb222e55957679a963e9f46c358e824d60af5c17
parent2d6d5e5be69260c00861aec6931f1e8cd469f685
parentbb0ef9bbee5c4de15a34fb7d9f21af60338b9f63
Merge branch 'master' of vcs.fsf.org:enc

Conflicts:
en/workshops.html