From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Tue, 11 Dec 2012 11:15:16 +0000 (+0100)
Subject: Merge branch 'master' into fork_master
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=95eb771dcda47f948b050da85c7ff22539e3ee12;p=youtube-dl.git

Merge branch 'master' into fork_master

Conflicts:
	.travis.yml
---

95eb771dcda47f948b050da85c7ff22539e3ee12
diff --cc .travis.yml
index c6c758fd5,0c62e4729..0aabce6a7
--- a/.travis.yml
+++ b/.travis.yml
@@@ -2,12 -2,10 +2,12 @@@ language: pytho
  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 --nocapture
+ script: nosetests test --verbose
 +notifications:
 +  email:
 +    - filippo.valsorda@gmail.com
 +  irc:
 +    channels:
 +      - "irc.freenode.org#youtube-dl"
 +    skip_join: true