From: Zak Rogoff <atticus@Amdijefri.office.fsf.org>
Date: Wed, 29 Oct 2014 21:02:11 +0000 (-0400)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d9095fb63f9697829c9522be464e842ee7f61005;p=libreplanet-static.git

Merge branch 'master' into stable
---

d9095fb63f9697829c9522be464e842ee7f61005