From: rsiddharth <rsd@gnu.org>
Date: Tue, 28 Oct 2014 18:16:01 +0000 (-0400)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=00efc9f44c2246deb97ce7bb9fe460cecd10718b;p=libreplanet-static.git

Merge branch 'master' into stable
---

00efc9f44c2246deb97ce7bb9fe460cecd10718b