Merge branch 'master' of vcs.fsf.org:libreplanet-static
authorZak Rogoff <zak@fsf.org>
Mon, 26 Oct 2015 15:46:58 +0000 (11:46 -0400)
committerZak Rogoff <zak@fsf.org>
Mon, 26 Oct 2015 15:46:58 +0000 (11:46 -0400)

Trivial merge