adobe/brackets — pull request #3185 by jasonsanjose (2013-03-20 16:36:47+00:00)
Title: fix merging of old prefs with new prefs

@TomMalbran @RaymondLim

See inline comments