adobe/brackets — pull request #4678 by jasonsanjose (2013-08-06 23:09:30+00:00)
Title: Fix merge conflicts for @kvarel

Fixing merge conflicts in #4607 for @kvarel