Richard Alam 2acd95b677 Merge branch 'master' into hangout-style		2011-11-09 10:08:11 -05:00
..
dev	- update join-mock.xml with new params	2010-07-15 10:30:36 -04:00
prod	- add locales in locales.xml	2011-11-01 10:20:35 -04:00
config.xml.template	Merge branch 'master' into hangout-style	2011-11-09 10:08:11 -05:00