{"head":"bee64545de025a60086c870349ba36b8fa88368a","size":1,"push_id":44156066,"shas":[["bee64545de025a60086c870349ba36b8fa88368a","824a8b3b53f622742eb0570ebe0b80cc73431e09@gmail.com","Merge branch 'master' into split-browser\n\nConflicts:\n\tsrc/MacVim/English.lproj/Preferences.nib/designable.nib\n\tsrc/MacVim/English.lproj/Preferences.nib/keyedobjects.nib","Eloy Duran"]],"ref":"refs/heads/split-browser"}