Richard Alam d43b7488ce Merge branch 'master' into view-publish-webcam-stanalone		2012-12-14 21:04:06 +00:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	Merge branch 'master' into view-publish-webcam-stanalone	2012-12-14 21:04:06 +00:00
config.xml.template	- add option to enable displaying of avatar	2012-12-04 19:09:45 +00:00