Richard Alam 9c6b27fb5f Merge branch 'master' into record-and-playback-feature ... Conflicts: bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as		2011-03-18 15:43:39 -04:00
..
bin	Fixed bug #834	2011-02-28 21:19:23 -05:00
record	added chrome plugin patch for test recording	2010-11-19 05:04:16 +00:00
slides	moving these configuration files into git	2010-09-18 23:24:04 +00:00
web	Fixed #671: Prevent users from entering the demo meeting with empty username	2011-03-16 15:57:42 -04:00