Merge branch 'master' of vcs.fsf.org:libreplanet-static
authorZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 26 Aug 2014 15:31:43 +0000 (11:31 -0400)
committerZak Rogoff <atticus@Amdijefri.office.fsf.org>
Tue, 26 Aug 2014 15:31:43 +0000 (11:31 -0400)
1  2 
2015/README.md

diff --cc 2015/README.md
Simple merge