Richard Alam a684aa4dfc Merge into bbb-1.1.dev ... Merge master, breakout rooms, and closed captioning into bbb-1.1-dev branch. Conflicts: akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as		2016-03-21 18:12:30 +00:00
..
main	Merge into bbb-1.1.dev	2016-03-21 18:12:30 +00:00
test	- try to upgrade bbb-apps to using akka	2015-05-11 22:24:33 +00:00