]> source.dussan.org Git - tigervnc.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorBrian P. Hinz <bphinz@users.sf.net>
Mon, 14 Mar 2016 22:03:08 +0000 (18:03 -0400)
committerBrian P. Hinz <bphinz@users.sf.net>
Mon, 14 Mar 2016 22:03:08 +0000 (18:03 -0400)

Trivial merge