From: Zak Rogoff Date: Tue, 29 Nov 2016 21:50:59 +0000 (-0500) Subject: Merge branch 'master' into stable X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c2ac9b23bbd46a29f8718c8fc9d0e75a52bcfd86;p=libreplanet-static.git Merge branch 'master' into stable --- c2ac9b23bbd46a29f8718c8fc9d0e75a52bcfd86