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

bbb-voice/src/main/webapp/WEB-INF/bigbluebutton-sip.properties

@@ -11,8 +11,8 @@ sip.server.password=secret
 # in your bbb_sip.conf. 
 # See http://code.google.com/p/bigbluebutton/source/browse/#svn/trunk/bbb-voice-conference/config/asterisk
 # create-sip-users.sh script to create the users.
-startAudioPort=34380
-stopAudioPort=34479
+startAudioPort=15000
+stopAudioPort=16383
 
 # An extension pattern, in case your asterisk extensions.conf
 # uses a naming convetion for your meeting rooms

bigbluebutton-apps/vm-build-debug.sh

@@ -1,7 +1,15 @@
-cd ~/dev/bbb-apps
+pushd .
+
+#stop current
+sudo /etc/init.d/red5 stop
+
+# build
+cd ~/dev/source/bigbluebutton/bigbluebutton-apps
 gradle resolveDeps war deploy
 
+# run
 cd /usr/share/red5/
-./red5.sh 
+sudo -u red5 ./red5.sh 
 
-cd ~/dev/bbb-apps
+#return to working dir
+popd

bigbluebutton-client/locale/en_US/bbbResources.properties

@@ -7,7 +7,7 @@ bbb.mainshell.locale.version=0.71
 bbb.mainshell.statusProgress.connecting = Connecting to the server
 bbb.mainshell.statusProgress.loading = Loading {0} modules
 bbb.mainshell.statusProgress.cannotConnectServer = Sorry, we cannot connect to the server.
-bbb.mainshell.copyrightLabel2 = (c) 2010, BigBlueButton build {0} - For more information see http://www.bigbluebutton.org/.
+bbb.mainshell.copyrightLabel2 = (c) 2011, BigBlueButton build {0} - For more information see http://www.bigbluebutton.org/.
 bbb.mainshell.logBtn.toolTip = Open Log Window
 bbb.mainshell.resetLayoutBtn.toolTip = Reset Layout
 

bigbluebutton-config/web/index.html

@@ -22,7 +22,7 @@
                 <div id="slogan"><h3>Demo Server</h3></div>
             </div>
             <div id="versionNum">
-                <p style="text-align:right;"><strong>What's new in version 0.71</strong></p>
+                <p style="text-align:right;"><strong>What's new in version 0.71a</strong></p>
                 <p style="text-align:right;">Improved VoIP</p>
                 <p style="text-align:right;">Selectable region for desktop sharing</p>
                 <p style="text-align:right;">Automatic chat translation</p>

bigbluebutton-web/vm-build-debug.sh

@@ -0,0 +1,14 @@
+pushd .
+
+# stop
+sudo /etc/init.d/tomcat6 stop
+
+# build
+cd ~/dev/source/bigbluebutton/bigbluebutton-web
+gradle copyToLib
+
+# run
+ant
+
+# return to working dir
+popd