Felipe Cecagno f8ee5b46c1 Merge branch '090-download-chat' into mconf-live0.6.1 ... Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml		2014-11-30 20:02:24 -02:00
..
bbbResources.properties	Merge branch '090-download-chat' into mconf-live0.6.1	2014-11-30 20:02:24 -02:00