From: Zak Rogoff <zak@fsf.org>
Date: Thu, 8 Dec 2016 16:46:10 +0000 (-0500)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cfeb6d5720697546e6720031dc010a017ad8e926;p=libreplanet-static.git

Merge branch 'master' into stable
---

cfeb6d5720697546e6720031dc010a017ad8e926