Mateus Dalepiane ba020a8e52 Merge branch '081-network-monitor' into 090-network-monitor ... Conflicts: bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml		2014-09-12 12:02:51 -03:00
..
bbbResources.properties	Merge branch '081-network-monitor' into 090-network-monitor	2014-09-12 12:02:51 -03:00