]> source.dussan.org Git - tigervnc.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorBrian P. Hinz <bphinz@users.sf.net>
Sat, 13 Feb 2016 14:52:12 +0000 (09:52 -0500)
committerBrian P. Hinz <bphinz@users.sf.net>
Sat, 13 Feb 2016 14:52:12 +0000 (09:52 -0500)

Trivial merge