Merge branch 'master' into v0.12.x: Nicolas Delaby's patch (#53)

This restores Python <= 2.7.3 support (#53)

Author: edschofield

future/moves/http/server.py

@@ -8,4 +8,9 @@
     from BaseHTTPServer import *
     from CGIHTTPServer import *
     from SimpleHTTPServer import *
-    from CGIHTTPServer import _url_collapse_path     # needed for a test
+    try:
+        from CGIHTTPServer import _url_collapse_path     # needed for a test
+    except ImportError:
+        # python 2.7.3
+        from CGIHTTPServer import (
+            _url_collapse_path_split as _url_collapse_path)