From: Zak Rogoff <zak@fsf.org>
Date: Fri, 18 Dec 2015 21:48:03 +0000 (-0500)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1aef936af5000bb8cc41a00506c89535addc75db;p=libreplanet-static.git

Merge branch 'master' into stable
---

1aef936af5000bb8cc41a00506c89535addc75db