From: Brian Hinz <bphinz@users.sf.net>
Date: Thu, 29 Jan 2015 00:45:34 +0000 (-0500)
Subject: Merge pull request #111 from bphinz/master
X-Git-Tag: v1.4.90~65
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=42e57a2fee608d2c51ca22cc4d7b632c085bcb23;p=tigervnc.git

Merge pull request #111 from bphinz/master

Merge of 1.4-branch fixes back into master
---

42e57a2fee608d2c51ca22cc4d7b632c085bcb23