Felipe Cecagno 3db4ead6e4 Merge branch '090-listen-only-by-default' into mconf-live0.6.1 ... Conflicts: bigbluebutton-client/locale/ru_RU/bbbResources.properties bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml		2014-10-15 00:22:27 -03:00
..
bbbResources.properties	Merge branch '090-listen-only-by-default' into mconf-live0.6.1	2014-10-15 00:22:27 -03:00