From: Alexander Green Date: Fri, 8 Nov 2013 11:10:41 +0000 (-0800) Subject: Merge branch 'master' of https://github.com/sugarcubes/SugarCubes into alexgreen X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=ceb90bf70c1e315c679ea1a5df9c06305f625d7d;p=SugarCubes.git Merge branch 'master' of https://github.com/sugarcubes/SugarCubes into alexgreen weird stuff changed default editor during merge ust ordering stuff in sugarcubes list --- ceb90bf70c1e315c679ea1a5df9c06305f625d7d