From: Brian P. Hinz <bphinz@users.sf.net>
Date: Fri, 22 Jan 2016 18:37:57 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v1.6.90~48^2~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=602f75a714683a5003b480496f02f435be762f8a;p=tigervnc.git

Merge remote-tracking branch 'upstream/master'
---

602f75a714683a5003b480496f02f435be762f8a