Merge branch 'master' of vcs.fsf.org:libreplanet-static
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 3 Mar 2015 20:01:05 +0000 (15:01 -0500)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 3 Mar 2015 20:01:05 +0000 (15:01 -0500)
1  2 
2015/program/speakers.html

Simple merge