Merge branch 'master' into 47-strict-assembling

neithere · Dec 29, 2013 · ab3856f · ab3856f
2 parents 3226887 + 153cd61
commit ab3856f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ python:
   - '2.7'
   - '3.2'
   - '3.3'
-  - 'pypy'
+  #- 'pypy'    # omitting due to obscure early segfault on PyPy 2.2.0
 install:
   - 'pip install -r reqs-dev.txt'
 script: py.test --cov=argh