merge brocken gbp import-orig

1 files changed, 3 insertions, 3 deletions

diff --git a/SConstruct b/SConstruct
index 34a5276..a3f2bb8 100644
--- a/SConstruct
+++ b/SConstruct
@@ -6,7 +6,7 @@
 copyright_years = '2001 - 2015'
 
 # This gets inserted into the man pages to reflect the month of release.
-month_year = 'June 2015'
+month_year = 'July 2015'
 
 #
 # Copyright (c) 2001 - 2015 The SCons Foundation
@@ -43,7 +43,7 @@ import tempfile
 import bootstrap
 
 project = 'scons'
-default_version = '2.3.5'
+default_version = '2.3.6'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 platform = distutils.util.get_platform()
@@ -822,7 +822,7 @@ for p in [ scons ]:
 
     #
     # Now run everything in src_file through the sed command we
-    # concocted to expand SConstruct, 2.3.5, etc.
+    # concocted to expand SConstruct, 2.3.6, etc.
     #
     for b in src_files:
         s = p['filemap'].get(b, b)