From 0f6787cb3f49166dd692c1dedaa0e6c54ade683b Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Tue, 27 Sep 2011 19:39:13 -0700
Subject: [PATCH] point noVNC back to master

---
 stackrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stackrc b/stackrc
index 993bca8f45..2d265d3057 100644
--- a/stackrc
+++ b/stackrc
@@ -12,7 +12,7 @@ KEYSTONE_BRANCH=diablo
 
 # a websockets/html5 or flash powered VNC console for vm instances
 NOVNC_REPO=https://github.com/cloudbuilders/noVNC.git
-NOVNC_BRANCH=nova-vncproxy-redux
+NOVNC_BRANCH=master
 
 # django powered web control panel for openstack
 DASH_REPO=https://github.com/cloudbuilders/openstack-dashboard.git