From: Brian P. Hinz <bphinz@users.sf.net>
Date: Thu, 29 Jan 2015 00:22:38 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v1.4.90~65^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7c7a540ee3db12c6c5a03240c5890c4618416a0c;p=tigervnc.git

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

7c7a540ee3db12c6c5a03240c5890c4618416a0c