From: Brian P. Hinz <bphinz@users.sf.net>
Date: Thu, 20 Aug 2015 04:18:01 +0000 (-0400)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v1.5.90~47^2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c245fa2ef29e8a985586761411cee23787d08aaa;p=tigervnc.git

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

c245fa2ef29e8a985586761411cee23787d08aaa