Merge branch 'master' of https://github.com/sugarcubes/SugarCubes into alexgreen
authorAlexander Green <alexandergreen22@gmail.com>
Fri, 8 Nov 2013 11:10:41 +0000 (03:10 -0800)
committerAlexander Green <alexandergreen22@gmail.com>
Fri, 8 Nov 2013 11:10:41 +0000 (03:10 -0800)
weird stuff changed default editor during merge
ust ordering stuff in sugarcubes list


No differences found