From: Zak Rogoff <zak@fsf.org>
Date: Mon, 26 Sep 2016 21:49:40 +0000 (-0400)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d8c654c111180a1fca81e60df2008bcfcccd9bdf;p=libreplanet-static.git

Merge branch 'master' into stable
---

d8c654c111180a1fca81e60df2008bcfcccd9bdf