Merge branch 'master' of git@github.com:kanaka/noVNC

diff --git a/README.md b/README.md
index a323ba844c8671ad4ab9c9223dec08d70c7a5d2d..1c09deff245378fa96540862aab250910621ed63 100644 (file)
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Special thanks to [Sentry Data Systems](http://www.sentryds.com) for
 sponsoring ongoing development of this project (and for employing me).
 
 There are many companies/projects that have integrated noVNC into
-their products including: [Sentry Data Systems](http://www.sentryds.com), [Ganeti Web Manager](http://code.osuosl.org/projects/ganeti-webmgr), [Archipel](http://archipelproject.org), [openQRM](http://www.openqrm.com/), [OpenNode](http://www.opennodecloud.com/), [OpenStack](http://www.openstack.org), [Broadway (HTML5 GDK/GTK+ backend)](http://blogs.gnome.org/alexl/2011/03/15/gtk-html-backend-update/), and [OpenNebula](http://opennebula.org/). See [this wiki page](https://github.com/kanaka/noVNC/wiki/Browser-support) for more info.
+their products including: [Sentry Data Systems](http://www.sentryds.com), [Ganeti Web Manager](http://code.osuosl.org/projects/ganeti-webmgr), [Archipel](http://archipelproject.org), [openQRM](http://www.openqrm.com/), [OpenNode](http://www.opennodecloud.com/), [OpenStack](http://www.openstack.org), [Broadway (HTML5 GDK/GTK+ backend)](http://blogs.gnome.org/alexl/2011/03/15/gtk-html-backend-update/), and [OpenNebula](http://opennebula.org/). See [this wiki page](https://github.com/kanaka/noVNC/wiki/ProjectsCompanies-using-noVNC) for more info and links.
 
 Notable commits, announcements and news are posted to
 @<a href="http://www.twitter.com/noVNC">noVNC</a>

diff --git a/include/websock.js b/include/websock.js
index df4827af361f86154a3ccb2d45942b431e698c9e..0d41ba9a93264d3c30ea209940d9e4a91aef2031 100644 (file)
--- a/include/websock.js
+++ b/include/websock.js
@@ -32,7 +32,7 @@ if (window.WebSocket) {
             end = "'><\/script>", extra = "";
 
         WEB_SOCKET_SWF_LOCATION = get_INCLUDE_URI() +
-                    "web-socket-js/WebSocketMain.swf?" + Math.random();
+                    "web-socket-js/WebSocketMain.swf?";
         if (Util.Engine.trident) {
             Util.Debug("Forcing uncached load of WebSocketMain.swf");
             WEB_SOCKET_SWF_LOCATION += "?" + Math.random();