]> source.dussan.org Git - tigervnc.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorBrian P. Hinz <bphinz@users.sf.net>
Mon, 10 Aug 2015 01:37:12 +0000 (21:37 -0400)
committerBrian P. Hinz <bphinz@users.sf.net>
Mon, 10 Aug 2015 01:37:12 +0000 (21:37 -0400)

Trivial merge