]> source.dussan.org Git - tigervnc.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorBrian P. Hinz <bphinz@users.sf.net>
Tue, 5 May 2015 02:02:54 +0000 (22:02 -0400)
committerBrian P. Hinz <bphinz@users.sf.net>
Tue, 5 May 2015 02:02:54 +0000 (22:02 -0400)

Trivial merge