From 2e109101fc79bb41a544b811de6f1020853696a8 Mon Sep 17 00:00:00 2001
From: Diederik van der Boor <vdboor@edoburu.nl>
Date: Mon, 8 Apr 2013 11:34:45 +0200
Subject: [PATCH] Fix and update Travis configuration

---
 .travis.yml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 92c9958..073d61f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,21 @@
 language: python
-
 python:
   - "2.6"
   - "2.7"
-
 env:
   - DJANGO=django==1.4.5
   - DJANGO=django==1.5
-
 install:
   - "pip install $DJANGO --use-mirrors"
 
 script:
-  - python ./manage.py test
-
-matrix:
-  allow_failures:
-    - env: DJANGO=django==1.5
+  - python runtests.py
+branches:
+  only:
+    - master
+notifications:
+  irc:
+    channels:
+      - "irc.freenode.org#django-polymorphic"
+    template:
+      - "%{repository}#%{build_number} (%{commit}) %{message}  --  %{build_url}"