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

Merge branch 'master' into stable
---

f030025f6774de6a07a22ba3313c6c797e0b7474