From: Zak Rogoff <zak@fsf.org>
Date: Mon, 26 Oct 2015 16:59:33 +0000 (-0400)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=69a920636b319db3b12de9b4d9500e2df62dc77b;p=libreplanet-static.git

Merge branch 'master' into stable
---

69a920636b319db3b12de9b4d9500e2df62dc77b