Felipe Cecagno 2c255dc9ae Merge branch '090-multinotes' into HEAD ... Conflicts: bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml bigbluebutton-client/resources/prod/layout.xml bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as		2015-01-25 12:12:53 -02:00
..
bbbResources.properties	Merge branch '090-multinotes' into HEAD	2015-01-25 12:12:53 -02:00