]> git.proxmox.com Git - mirror_novnc.git/commitdiff
Merging with upstream tree.
authorSoheil Hassas Yeganeh <soheil@cs.toronto.edu>
Fri, 8 Jun 2012 15:12:22 +0000 (11:12 -0400)
committerSoheil Hassas Yeganeh <soheil@cs.toronto.edu>
Fri, 8 Jun 2012 15:12:22 +0000 (11:12 -0400)

Trivial merge