From: Zak Rogoff <zak@fsf.org>
Date: Thu, 6 Oct 2016 15:12:57 +0000 (-0400)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dc24e5d910ffb29dc026b2b0fcd22bbb33c4f515;p=libreplanet-static.git

Merge branch 'master' into stable
---

dc24e5d910ffb29dc026b2b0fcd22bbb33c4f515