@deniszgonjanin 46eae2e4ec Merge branch 'master' of github.com:bigbluebutton/bigbluebutton		2011-03-04 17:36:10 -05:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	update locale for ukrainian and norwegian	2011-03-01 10:35:18 +00:00
config.xml.template	Merge branch 'master' of github.com:bigbluebutton/bigbluebutton	2011-03-04 17:36:10 -05:00