Conflicts:
	FindViewController.m
	Headers/iTerm/VT100Screen.h
	PTYScrollView.m
	Trouter.h
	Trouter.m

* cross_repo_merge: (63 commits)
  Remove variable stroke thickness from prefs for performance reasons
  Fix how inet_ntop was called. Fixes bug 519.
  Fix leak of job name
  Split panes using the original profile of the source pane.
  Use same baseline for bold secondary font as for regular secondary font. Fixes bug 760.
  Fix bug where right click didn't open context menu
  Change split pane dimming. Improve docs.
  Make shift-arrows move through IR faster.
  Improve URL regex. Handle smart matches that go to last char. Give URLs higher precision that email addresses to handle URLs with username/pw that look like email addrs
  Improve regex for paths. Fix smart-select-and-drag.
  Update docs
  Try to fix bug 753 by ignoring drag events where the mouse isn't down.
  Swap triple and quad click functions. Fix url regex.
  remove text indent
  Update docs to latest version
  Add dot to URL smart match pattern. Update help to match website.
  Fix ghosting issue. Fixes bug 299. Speed up find ui's animation.
  Make fullscreen visor window work better with focus follow mouse. Send visor to back of app's widows when closed.
  Allow you to unregister a profile for a url scheme. Fixes bug 752.
  Handle case where there's a selection after the last non-empty line.
  ...

Conflicts:
	Headers/iTerm/PTYTextView.h

Improve URL regex. Handle smart matches that go to last char. Give URLs higher precision that email addresses to handle URLs with username/pw that look like email addrs

Make fullscreen visor window work better with focus follow mouse. Send visor to back of app's widows when closed.

Apply patch from Tejas Dinkar to add a hidden setting for visor animation. Make sure menu bar's hidden status is correct with fullscreen visor.

"Autocomplete.m"
"DVR.h"
"DVR.m"
"DVRBuffer.h"
"DVRBuffer.m"
"DVRDecoder.h"
"DVRDecoder.m"
"DVREncoder.h"
"DVREncoder.m"
"DVRIndexEntry.h"
"DVRIndexEntry.m"
"EncodingsWithLowerCase.plist"
"English.lproj/Autocomplete.xib"
"English.lproj/FindView.xib"
"English.lproj/GlobalSearch.xib"
"English.lproj/PasteboardHistory.xib"
"English.lproj/iTerm2 Help/"
"FakeWindow.h"
"FakeWindow.m"
"FindView.h"
"FindView.m"
"FindViewController.h"
"FindViewController.m"
"GlobalSearch.h"
"GlobalSearch.m"
"NSDateFormatterExtras.h"
"NSDateFormatterExtras.m"
"PSMTabBarControl/iTermDiffs/"
"PTYTab.h"
"PTYTab.m"
"PasteboardHistory.h"
"PasteboardHistory.m"
"Popup.h"
"Popup.m"
"RegexKitLite/"
"ScreenChar.h"
"ScreenChar.m"
"SessionView.h"
"SessionView.m"
"TextViewWrapper.h"
"TextViewWrapper.m"
"UKCrashReporter/"
"WindowControllerInterface.h"
"crash_report_to_plist.py"
"iTerm.xcodeproj/georgen.mode1v3"
"iTerm.xcodeproj/georgen.pbxuser"
"iTermExpose.h"
"iTermExpose.m"
"iTermSearchField.h"
"iTermSearchField.m"
"images/IBarCursor.png"
"images/bell.png"
"images/bell.psd"
"images/screen.png"
"images/wrap.psd"
"images/wrap_to_bottom.png"
"images/wrap_to_top.png"
"nightly.sh"
"ply/"
"tests/UTF-8-demo.txt"
"tests/a-harpoon.txt"
"tests/acid.txt"
"tests/apple.txt"
"tests/bogusutf8.txt"
"tests/bold-complex.txt"
"tests/bug439.applescript"
"tests/colors.sh"
"tests/combiningmark.txt"
"tests/dw_sip.txt"
"tests/enclosing-mark.txt"
"tests/english_and_chinese.txt"
"tests/greek.txt"
"tests/harpoon.txt"
"tests/low-surrogate.txt"
"tests/radical.txt"
"tests/ranges.py"
"tests/register_bonjour_host"
"tests/reverse_mode.txt"
"tests/searchtext"
"tests/set_icon_title.txt"
"tests/set_icon_window_title.txt"
"tests/set_window_title.txt"
"tests/setbg-blue"
"tests/setbg-yellow"
"tests/setpal"
"tests/spaces.txt"
"tests/spacing-combining-mark.txt"
"tests/spam-tabs.cc"
"tests/suits.txt"
"tests/surrogatepair.txt"
"tests/too_many_parts.txt"
"tests/u2000b.txt"
"tests/zeta.txt"