Felipe Cecagno 356fbcccad Merge branch 'audio-video-on-api-v0.81' into 090-audio-video-on-api ... Most of the work had to be done again because of the way BigBlueButton exchanges messages today. Conflicts: bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/Room.java bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserJoinedEvent.java bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomImp.java bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomManager.java bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessageListener.java bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingConstants.java bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java		2014-09-18 17:09:00 -03:00
..
org/bigbluebutton/web/controllers	Merge branch 'audio-video-on-api-v0.81' into 090-audio-video-on-api	2014-09-18 17:09:00 -03:00