bigbluebutton-Github/bigbluebutton-client/locale/en_US
Felipe Cecagno 13d15d0761 Merge branch 'issue1534' into mconf-live0.6.2
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
2015-04-01 10:19:17 -03:00
..
bbbResources.properties Merge branch 'issue1534' into mconf-live0.6.2 2015-04-01 10:19:17 -03:00