From: Zak Rogoff <zak@montage.office.fsf.org>
Date: Fri, 13 Feb 2015 20:15:55 +0000 (-0500)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2715a8775ce1ac94b969a8bc6f65347287215589;p=libreplanet-static.git

Merge branch 'master' into stable
---

2715a8775ce1ac94b969a8bc6f65347287215589