From: bb3dan <github@bb3systems.com>
Date: Sat, 19 Oct 2013 01:15:43 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/sugarcubes/SugarCubes
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=d174ec52e9ed7bdb10f9bd9384f200bc97fe1c0e;p=SugarCubes.git

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

d174ec52e9ed7bdb10f9bd9384f200bc97fe1c0e