]> source.dussan.org Git - tigervnc.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorBrian P. Hinz <bphinz@users.sf.net>
Sun, 9 Aug 2015 18:33:46 +0000 (14:33 -0400)
committerBrian P. Hinz <bphinz@users.sf.net>
Sun, 9 Aug 2015 18:33:46 +0000 (14:33 -0400)

Trivial merge