Anton Georgiev 7bf1d4ce8c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-3 ... Conflicts: record-and-playback/core/scripts/bigbluebutton.yml		2015-11-30 21:44:04 +00:00
..
presentation.rb	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-3	2015-11-30 21:44:04 +00:00