Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

ritzalam · ritzalam · commit ace0e438f91d · 2012-08-20T20:25:31.000Z
diff --git a/bigbluebutton-client/src/BigBlueButton.mxml b/bigbluebutton-client/src/BigBlueButton.mxml
@@ -255,8 +255,6 @@
 		]]>
 	</mx:Script>	
 	
-	<m:Melomel/>
-	
 	<maps:ApplicationEventMap />	
 	<views:MainApplicationShell id="mainShell"/>	
 	
