]> git.proxmox.com Git - mirror_novnc.git/commitdiff
Merge branch 'master' of git@github.com:kanaka/noVNC
authorJoel Martin <github@martintribe.org>
Fri, 7 Jan 2011 00:33:22 +0000 (17:33 -0700)
committerJoel Martin <github@martintribe.org>
Fri, 7 Jan 2011 00:33:22 +0000 (17:33 -0700)

Trivial merge