Felipe Cecagno 9a2c605866 Merge branch 'master' into multicamera-0.81 ... Conflicts: bigbluebutton-client/branding/default/style/css/BBBDefault.css bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as		2013-09-29 21:19:29 -03:00
..
bigbluebutton/web/controllers	Merge branch 'master' into multicamera-0.81	2013-09-29 21:19:29 -03:00