Merge branch 'master' of vcs.fsf.org:enc
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 18 Aug 2015 20:25:53 +0000 (16:25 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 18 Aug 2015 20:25:53 +0000 (16:25 -0400)
1  2 
en/workshops.html

Simple merge