From: David Thompson <davet@gnu.org>
Date: Thu, 18 Sep 2014 14:29:34 +0000 (-0400)
Subject: Merge branch 'master' into stable.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=04e0e7bc6712f5d48a896b2211db5340132eb9b1;p=libreplanet-static.git

Merge branch 'master' into stable.
---

04e0e7bc6712f5d48a896b2211db5340132eb9b1