]> 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 01:13:39 +0000 (19:13 -0600)
committerJoel Martin <github@martintribe.org>
Fri, 7 Jan 2011 01:13:39 +0000 (19:13 -0600)

Trivial merge