From 4c1933f522731e1ae5874275025a8d20b9e63336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 11 Sep 2012 19:38:11 +0200
Subject: remove pypy from travis-ci allow_failures list

---
 .travis.yml      | 6 ------
 CONTRIBUTORS.txt | 2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 490fd2df7..ab9c3ff30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,6 @@ python:
   - pypy
   - 3.2
 
-# Why does travis-ci's PyPy blow up?  Pyramid's tests
-# run fine under tox.
-matrix:
-  allow_failures:
-    - python: pypy
-
 script: python setup.py test
 
 notifications:
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 264acf048..bb11006f3 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -182,3 +182,5 @@ Contributors
 - Ian Wilson, 2012/06/17
 
 - Roman Kozlovskyi, 2012/08/11
+
+- Domen Kozar, 2012/09/11
-- 
cgit v1.2.3