Chad Pilkey 97bfcbb068 Merge remote branch 'upstream/master' ... Conflicts: bigbluebutton-client/resources/prod/BigBlueButton.html bigbluebutton-client/src/BigBlueButton.mxml record-and-playback/presentation/playback/presentation/css/bbb.playback.css record-and-playback/presentation/playback/presentation/playback.html record-and-playback/presentation/playback/presentation/playback.js		2012-09-21 21:27:23 +00:00
..
playback/presentation	Merge remote branch 'upstream/master'	2012-09-21 21:27:23 +00:00
scripts	Remove dependency on slides scripts	2012-09-15 21:27:10 -05:00