Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

...va/org/bigbluebutton/voiceconf/red5/media/CallStream.java

...igbluebutton/voiceconf/red5/media/CallStreamObserver.java

...bigbluebutton/voiceconf/red5/media/RtpStreamReceiver.java

.../main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java

deskshare/.gitignore

deskshare/build/com/myjavatools/web/ClientHttpRequest.class

...jargs/gnu/CmdLineParser$IllegalOptionValueException.class

...hare/build/jargs/gnu/CmdLineParser$NotFlagException.class

.../build/jargs/gnu/CmdLineParser$Option$BooleanOption.class

...e/build/jargs/gnu/CmdLineParser$Option$DoubleOption.class

.../build/jargs/gnu/CmdLineParser$Option$IntegerOption.class

...are/build/jargs/gnu/CmdLineParser$Option$LongOption.class

...e/build/jargs/gnu/CmdLineParser$Option$StringOption.class

deskshare/build/jargs/gnu/CmdLineParser$Option.class

...share/build/jargs/gnu/CmdLineParser$OptionException.class

...uild/jargs/gnu/CmdLineParser$UnknownOptionException.class

...d/jargs/gnu/CmdLineParser$UnknownSuboptionException.class

deskshare/build/jargs/gnu/CmdLineParser.class

deskshare/build/java.policy.applet

...d/org/bigbluebutton/deskshare/client/ClientListener.class