Merge branch 'master' of vcs.fsf.org:libreplanet-static
authorZak Rogoff <zak@montage.office.fsf.org>
Wed, 1 Oct 2014 20:13:22 +0000 (16:13 -0400)
committerZak Rogoff <zak@montage.office.fsf.org>
Wed, 1 Oct 2014 20:13:22 +0000 (16:13 -0400)

Trivial merge