Merge branch 'default' of github.com:travis-ci/cpython-builder into default

Conflicts:
	.travis.yml

Author: BanzaiMan

.travis.yml

@@ -25,23 +25,23 @@ install:
   - sudo git pull
   - popd
 
-  before_script:
-    - 'export INSTALL_DEST=${INSTALL_DEST:-/opt/python}'
-    - export LSB_RELEASE=$(lsb_release -rs 2>/dev/null || sw_vers -productVersion | sed 's/^\([0-9][0-9]*.[0-9][0-9]*\).*/\1/')'
-    - 'export OS_NAME=${OS_NAME:-$((lsb_release -is || echo "osx") | tr "A-Z" "a-z")}'
-    - 'export ARCH=${ARCH:-$(uname -m)}'
-    - 'export PACKAGES=${PACKAGES:-pip numpy nose pytest mock wheel}'
-
-  script: ./build-python
-
-  after_success: ./create-archive
-
-  after_failure:
-    - cat /tmp/python-build.*.log
-
-  addons:
-    artifacts:
-      paths:
-      - $LSB_RELEASE/
-      target_paths:
-      - /binaries/$OS_NAME/$LSB_RELEASE/$ARCH
+before_script:
+  - 'export INSTALL_DEST=${INSTALL_DEST:-/opt/python}'
+  - export LSB_RELEASE=$(lsb_release -rs 2>/dev/null || sw_vers -productVersion | sed 's/^\([0-9][0-9]*.[0-9][0-9]*\).*/\1/')'
+  - 'export OS_NAME=${OS_NAME:-$((lsb_release -is || echo "osx") | tr "A-Z" "a-z")}'
+  - 'export ARCH=${ARCH:-$(uname -m)}'
+  - 'export PACKAGES=${PACKAGES:-pip numpy nose pytest mock wheel}'
+
+script: ./build-python
+
+after_success: ./create-archive
+
+after_failure:
+  - cat /tmp/python-build.*.log
+
+addons:
+  artifacts:
+    paths:
+    - $LSB_RELEASE/
+    target_paths:
+    - /binaries/$OS_NAME/$LSB_RELEASE/$ARCH