Merge branch 'alternate_mousescroll' of https://github.com/FiloSottile/iTerm2 into FiloSottile-alternate_mousescroll
Minor improvements to pull request 164 for style
Fix format strings in NSRunAlertPanel
Better signal picker in Jobs toolbelt
Fix a small leak.
Make PTYTextView implement NSTextInputClient. Fixes bug 2928 (chinese punctuation box doesn't show on shift-opt-b with pinyin input method).
Merge branch 'master' of https://github.com/percontation/iTerm2 into percontation-master
Fix capitalization of OK and arguments to various alert panels for XCode 5.1 warnings
Style cleanup.
Merge branch 'master' of https://github.com/pose/iTerm2 into pose-master
Remove unused variable
Rename session argument of applescript split command to profile.
Add back color-related key-value coding methods to PTYSession.
Clean up PTYWindow
Hide hotkey window when no iterm window is main or when another terminal window becomes key. This allows things like clipboard managers (which don't affect the main window) to not dismiss the hotkey window, but switching terminals or going to another app will hide it. Also fix a bug where the menu bar wasn't hidden when toggling a fullscreen hotkey window.
Hide the menu bar when switching from settings to fullscreen hotkey window
Fix UKCrashReporter for OSX 10.7+ (yikes)

Conflicts:
	UKCrashReporter/UKCrashReporter.m
Merge branch 'master' of https://github.com/fmichea/iTerm2 into fmichea-master
Minor clean up of pull request 165. Add -defaultIndex method to Trigger subclasses that let them specify the index of the default parameter value.
Merge branch 'master' of https://github.com/gnachman/iTerm2