Felipe Cecagno 322176ddf3 Merge branch 'record-button' of https://github.com/guilhermedias/bigbluebutton into record-button ... Conflicts: record-and-playback/presentation/scripts/publish/presentation.rb		2013-09-26 13:06:15 -03:00
..
presentation.rb	Merge branch 'record-button' of https://github.com/guilhermedias/bigbluebutton into record-button	2013-09-26 13:06:15 -03:00