Chad Pilkey 638b3d01a4 Merge remote branch 'upstream/master' into access-hotfix ... Conflicts: bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml		2013-03-01 20:12:07 -05:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	fixed a lot of issues with accessibility	2013-03-01 20:00:33 -05:00
config.xml.template	Merge remote branch 'upstream/master' into access-hotfix	2013-03-01 20:12:07 -05:00
streams.xml	- build BBB default style	2012-12-28 17:32:14 +00:00