From: Alexander Green <alexandergreen22@gmail.com>
Date: Fri, 25 Oct 2013 01:08:10 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/sugarcubes/SugarCubes
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=5c3620000613b6d6e40e80f93cde2e8fd688cf5d;p=SugarCubes.git

Merge branch 'master' of https://github.com/sugarcubes/SugarCubes
local stuff
---

5c3620000613b6d6e40e80f93cde2e8fd688cf5d