Felipe Cecagno a45bbfb29a Merge branch '090-multinotes' into mconf-live0.6.1 ... Conflicts: bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala 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/model/LayoutDefinition.as		2014-12-02 20:04:23 -02:00
..
bbbResources.properties	Merge branch '090-multinotes' into mconf-live0.6.1	2014-12-02 20:04:23 -02:00