Merge branch 'master' of https://github.com/sugarcubes/SugarCubes
authorVincent Siao <vincentsiao@gmail.com>
Sun, 24 Nov 2013 00:52:06 +0000 (16:52 -0800)
committerVincent Siao <vincentsiao@gmail.com>
Sun, 24 Nov 2013 00:52:06 +0000 (16:52 -0800)

Trivial merge