Merge branch 'master' into fork_master

[youtube-dl] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 0c62e4729681c7a7a865bcedad24f8b6b2d76e5a..0aabce6a73cf96dc70bff38901a6e4f98521bf17 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,13 @@
 language: python
-#specify the python version
 python:
   - "2.6"
   - "2.7"
-notifications:
-  irc: "irc.freenode.org#youtube-dl"
-#command to install the setup
-install:
-# command to run tests
+#  - "3.3"
 script: nosetests test --verbose
+notifications:
+  email:
+    - filippo.valsorda@gmail.com
+  irc:
+    channels:
+      - "irc.freenode.org#youtube-dl"
+    skip_join: true