From: Daniel Imms <daimms@microsoft.com>
Date: Mon, 16 Jan 2017 23:17:35 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/master' into 459_parser__on_460
X-Git-Url: https://git.proxmox.com/?p=mirror_xterm.js.git;a=commitdiff_plain;h=e2b2f98011e7aa624345c4b28c5db72acfcf742d

Merge remote-tracking branch 'upstream/master' into 459_parser__on_460
---

e2b2f98011e7aa624345c4b28c5db72acfcf742d