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

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

a8303b92004dec41c3ba1e3be5594e373ad5fada