From: Zak Rogoff <zak@montage.office.fsf.org>
Date: Thu, 5 Feb 2015 16:14:16 +0000 (-0500)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=514f5031edf7f37cac8db40f467ecf6b378973b2;p=libreplanet-static.git

Merge branch 'master' into stable
---

514f5031edf7f37cac8db40f467ecf6b378973b2