Richard Alam 2765a178ce - merging changes from Markos ... Conflicts: bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml bigbluebutton-web/grails-app/conf/spring/resources.xml bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java bigbluebutton-web/src/java/org/bigbluebutton/presentation/OfficeToPdfConversionSuccessFilter.java bigbluebutton-web/src/java/org/bigbluebutton/presentation/SupportedDocumentFilter.java bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java		2011-06-16 09:28:14 -04:00
..
services	- merging changes from Markos	2011-06-16 09:28:14 -04:00