From: Zak Rogoff <zak@fsf.org>
Date: Mon, 1 Feb 2016 21:58:43 +0000 (-0500)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b60ad649f4727b4537e5c3cf5b5d74161fd9303c;p=libreplanet-static.git

Merge branch 'master' into stable
---

b60ad649f4727b4537e5c3cf5b5d74161fd9303c