Anton Georgiev a6d2ecc8a4 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton ... Conflicts: bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala		2015-01-09 16:32:10 +00:00
..
main	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton	2015-01-09 16:32:10 +00:00
test	- fix tests	2014-07-22 12:24:24 -07:00