]> source.dussan.org Git - tigervnc.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorBrian P. Hinz <bphinz@users.sf.net>
Fri, 22 Jan 2016 18:37:57 +0000 (13:37 -0500)
committerBrian P. Hinz <bphinz@users.sf.net>
Fri, 22 Jan 2016 18:37:57 +0000 (13:37 -0500)

Trivial merge