Felipe Cecagno 0843ec1361 Merge branch '090-mconf-branding' into HEAD ... Conflicts: bigbluebutton-client/locale/ru_RU/bbbResources.properties bigbluebutton-config/web/default.pdf		2015-01-25 11:59:45 -02:00
..
bbbResources.properties	Merge branch '090-mconf-branding' into HEAD	2015-01-25 11:59:45 -02:00