From: Alex Patel <alexanderpatel@college.harvard.edu>
Date: Sun, 22 Mar 2015 13:04:36 +0000 (-0400)
Subject: Merge branch 'master' into stable
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d66522860f5a2d479e5be55ab4d78b37069b995c;p=libreplanet-static.git

Merge branch 'master' into stable
---

d66522860f5a2d479e5be55ab4d78b37069b995c