Felipe Cecagno 6e0553ed7c Merge branch 'record-button' of github.com:guilhermedias/bigbluebutton into record-button ... Conflicts: record-and-playback/presentation/scripts/publish/presentation.rb		2013-10-07 22:36:31 -03:00
..
presentation.rb	Merge branch 'record-button' of github.com:guilhermedias/bigbluebutton into record-button	2013-10-07 22:36:31 -03:00