Merge branch 'merge-polling-with-master' of...

Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master

Merge branch 'merge-polling-with-master' of...
a7f2d17c · Richard Alam · bb5db33e · 44e2255b · a7f2d17c · a7f2d17c
Commit a7f2d17c authored 11 years ago by Richard Alam
--- a/bigbluebutton-config/bigbluebutton-release
+++ b/bigbluebutton-config/bigbluebutton-release
-BIGBLUEBUTTON_RELEASE=0.81
+BIGBLUEBUTTON_RELEASE=0.9.0-dev
--- a/bigbluebutton-config/bin/bbb-conf
+++ b/bigbluebutton-config/bin/bbb-conf
--- a/bigbluebutton-config/web/index.html
+++ b/bigbluebutton-config/web/index.html
@@ -101,7 +101,7 @@
 	<p id="legal">
 		<br>BigBlueButton and the BigBlueButton logo are trademarks of BigBlueButton Inc.<br>
 		Copyright © 2013 <a href="http://bigbluebutton.org/" title="BigBlueButton">BigBlueButton Inc.</a>  <br>
-		<a href="http://code.google.com/p/bigbluebutton/wiki/ReleaseNotes" title="BigBlueButton Release Notes" target="_blank">version 0.81</a>
+		<a href="http://code.google.com/p/bigbluebutton/wiki/ReleaseNotes" title="BigBlueButton Release Notes" target="_blank">version 0.9.0-dev</a>
 	</p>
 </div>
 <!-- Footer End -->