Merge branch 'master' of vcs.fsf.org:libreplanet-static
authorAndrew Engelbrecht <sudoman@ninthfloor.org>
Thu, 16 Mar 2017 20:58:59 +0000 (16:58 -0400)
committerAndrew Engelbrecht <sudoman@ninthfloor.org>
Thu, 16 Mar 2017 20:58:59 +0000 (16:58 -0400)

Trivial merge