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

Merge branch 'master' into stable
---

624878e30ead653ee41203a28a210812834f7ada