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

This commit is contained in:
Joel Martin 2012-06-23 14:23:50 -05:00
commit 18232af2a6
1 changed files with 1 additions and 1 deletions

View File

@ -30,9 +30,9 @@ import wsproxy
from nova import context from nova import context
from nova import flags from nova import flags
from nova import rpc
from nova import utils from nova import utils
from nova.openstack.common import cfg from nova.openstack.common import cfg
from nova.openstack.common import rpc
opts = [ opts = [