When changing an existing session's profile, also change its idea of what its original profile (originalAddressBookEntry) was so that when splitting it splits with the new profile instead of the old one. Fixes bug 2632.
Refuse to connect to tmux in aggressive-resize mode
Fix crasher where a CRun attribute's color could get dealloced when another NSColor was created with the same attributes. Not sure why autorelease semantics are violated this way by NSColor. The fix is to explicitly keep a reference to every color used in a run in the CRunStorage object.
Fix merge conflicts
Fix errors in merge
Fix a bunch of analyzer warnings
Fix analyzer warnings
Make broadcast to all panes in current tab be a per-tab setting.
Round font width rather than using floor because with 11pt monaco, it was too tight (eg on O])
Make unblockPipeW nonblocking (pun not intended) to fix bug 2633. The PTYTask thread would get stuck in readTask waiting for the mainThread to complete -[PTYSession readTask:] while the main thread was stuck in -unblock waiting to write to unblockPipeW, which is only read by the PTYTask thread. Since unblockPipeW was blocking, it must have had a lot of pending writes that hadn't been read off, and dropping one on the floor won't matter because the thread will definitely get unblocked.
Merge branch 'master' of https://github.com/gnachman/iTerm2
Get it kind of working but it crashes in windowDidResignMain, not sure why that if statement is there

Add comments, force hotkey window to enter traditional fullscreen

Allow borderless windows glued to a screen edge to enter fullscreen mode. They can't enter Lion fullscreen mode because they're auxiliary windows (which allows them to appear over other fullscreen windows), but they cannot enter Lion fullscreen mode themselves. However, they're fine with traditional fullscreen, which I think is more useful for a hotkey window anyway since it won't change spaces on you.
Make the hotkey window go all the way off the screen. It was incorrectly using the screen's visible frame to compute its offscreen position. Fixes bug 2638