Felipe Cecagno aa597fe985 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button-client ... Conflicts: bigbluebutton-client/branding/default/style/css/BBBDefault.css bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml record-and-playback/core/lib/recordandplayback.rb record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb record-and-playback/core/lib/recordandplayback/generators/events.rb record-and-playback/core/lib/recordandplayback/generators/video.rb record-and-playback/presentation/scripts/publish/presentation.rb		2013-09-24 15:03:44 -03:00
..
css	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button-client	2013-09-24 15:03:44 -03:00