Merge branch 'master' of vcs.fsf.org:enc
authorAdam Leibson <adaml@fsf.org>
Tue, 18 Aug 2015 20:37:49 +0000 (16:37 -0400)
committerAdam Leibson <adaml@fsf.org>
Tue, 18 Aug 2015 20:37:49 +0000 (16:37 -0400)
commit0299f01d338affb34235e2ceabc19a43d745e804
treebdd392a807396014dc6f25d65f8d58c025f776c6
parent367b6cecca594ee19ed1d47655195c08dd9b9570
parent77fcfb4a04663552b379aa30c688ec58dd7dd20c
Merge branch 'master' of vcs.fsf.org:enc
en/workshops.html