From: Brian P. Hinz <bphinz@users.sf.net>
Date: Sat, 13 Feb 2016 14:52:12 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v1.6.90~48^2~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=80579ab05d02cda967e2d05423914b8f1eb201ad;p=tigervnc.git

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

80579ab05d02cda967e2d05423914b8f1eb201ad