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

Merge branch 'master' into stable
---

b95bc86ec2ceace229efc535c4b2dd8b1d4d92fa