From: Zak Rogoff <zak@fsf.org>
Date: Fri, 4 Dec 2015 22:49:28 +0000 (-0500)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=406e582aaa42a9679cbc0efce678a88d02ab58eb;p=libreplanet-static.git

Merge branch 'master' into stable
---

406e582aaa42a9679cbc0efce678a88d02ab58eb