Merge branch 'master' of https://github.com/sugarcubes/SugarCubes
authorbb3dan <github@bb3systems.com>
Sat, 19 Oct 2013 03:08:45 +0000 (20:08 -0700)
committerbb3dan <github@bb3systems.com>
Sat, 19 Oct 2013 03:08:45 +0000 (20:08 -0700)

Trivial merge