Merge branch 'master' of vcs.fsf.org:libreplanet-static
authorZak Rogoff <zak@montage.office.fsf.org>
Mon, 23 Mar 2015 16:55:28 +0000 (12:55 -0400)
committerZak Rogoff <zak@montage.office.fsf.org>
Mon, 23 Mar 2015 16:55:28 +0000 (12:55 -0400)

Trivial merge