]> source.dussan.org Git - tigervnc.git/commitdiff
Merge remote-tracking branch 'upstream/master'
authorBrian P. Hinz <bphinz@users.sf.net>
Thu, 29 Jan 2015 00:22:38 +0000 (19:22 -0500)
committerBrian P. Hinz <bphinz@users.sf.net>
Thu, 29 Jan 2015 00:22:38 +0000 (19:22 -0500)

Trivial merge