Richard Alam b7ab683e84 - merge master into echo-cancel and h264 branches ... Conflicts: bigbluebutton-client/src/BigBlueButton.mxml bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindow.mxml		2011-07-21 17:49:08 +00:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	- play around with melomel	2011-07-21 17:22:25 +00:00
config.xml.template	- add option in config.xml to not display prompt when logging out	2011-07-21 11:22:48 -04:00