From: rsiddharth <rsd@gnu.org>
Date: Wed, 29 Oct 2014 13:14:33 +0000 (-0400)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9fef225e42d95897cfb218c301ca2c2769e5df65;p=libreplanet-static.git

Merge branch 'master' into stable
---

9fef225e42d95897cfb218c301ca2c2769e5df65