Merge remote-tracking branch 'alteredq/dev' into dev

docs/conf.py

@@ -41,16 +41,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'three.js'
-copyright = u'2011, three.js Authors'
+copyright = u'2010-2012, three.js Authors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = 'r47'
+version = 'r48dev'
 # The full version, including alpha/beta/rc tags.
-release = 'r47'
+release = 'r48dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.