From: rsiddharth <rsd@gnu.org>
Date: Sun, 28 Feb 2016 14:48:04 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into mobile
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=677474f80c3aa6f3aeeebe4e354028536b3f647a;p=libreplanet-static.git

Merge remote-tracking branch 'origin/master' into mobile
---

677474f80c3aa6f3aeeebe4e354028536b3f647a