From: Zak Rogoff Date: Wed, 28 Jan 2015 22:53:42 +0000 (-0500) Subject: Merge branch 'master' into stable X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=36fcf0934a8bec4b96b83c9f36f48f603ede21f8;p=libreplanet-static.git Merge branch 'master' into stable --- 36fcf0934a8bec4b96b83c9f36f48f603ede21f8