Felipe Cecagno 65163c49ef Merge branch 'master' into guest-role-0.81 ... Conflicts: bigbluebutton-client/locale/en_US/bbbResources.properties bigbluebutton-client/locale/pt_BR/bbbResources.properties bigbluebutton-client/src/org/bigbluebutton/main/events/LogoutEvent.as bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml		2013-08-26 15:13:38 -03:00
..
web/controllers	Merge branch 'master' into guest-role-0.81	2013-08-26 15:13:38 -03:00