From: Daniel Imms <daimms@microsoft.com>
Date: Wed, 21 Dec 2016 23:43:18 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/master' into 361_circular_list_scrollback
X-Git-Url: https://git.proxmox.com/?p=mirror_xterm.js.git;a=commitdiff_plain;h=4bc679b0b30b13549f58ac2084a868f7028d9c21

Merge remote-tracking branch 'upstream/master' into 361_circular_list_scrollback
---

4bc679b0b30b13549f58ac2084a868f7028d9c21