Felipe Cecagno 2a3b95daf7 Merge remote-tracking branch 'bigbluebutton/master' into mconf ... Conflicts: akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java bigbluebutton-client/locale/en_US/bbbResources.properties bigbluebutton-client/locale/pt_BR/bbbResources.properties bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as bigbluebutton-config/bin/bbb-conf		2016-01-26 18:33:31 -02:00
..
bbb-conf	Merge remote-tracking branch 'bigbluebutton/master' into mconf	2016-01-26 18:33:31 -02:00
bbb-record	Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release	2015-05-17 19:25:26 -03:00