Richard Alam d402f7b333 Merge branch 'master' ... Conflicts: bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml		2013-09-09 18:42:21 +00:00
..
bigbluebutton/web/controllers	Merge branch 'master'	2013-09-09 18:42:21 +00:00