From: Rogério Brito <rbrito@ime.usp.br>
Date: Thu, 23 May 2013 00:00:29 +0000 (-0300)
Subject: Merge tag 'upstream/2013.05.14'
X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/c7b4d76a372777e3af76ecf9966a8ab9952e52f4?ds=sidebyside;hp=-c

Merge tag 'upstream/2013.05.14'

Upstream version 2013.05.14. We remove our own changes to avoid future
conflicts.

Conflicts:
	.gitignore
---

c7b4d76a372777e3af76ecf9966a8ab9952e52f4
diff --combined .gitignore
index b13aa17,ca4e8f3..77469b8
--- a/.gitignore
+++ b/.gitignore
@@@ -1,7 -1,7 +1,7 @@@
  *.pyc
  *.pyo
  *~
- /.pc
+ *.DS_Store
  wine-py2exe/
  py2exe.log
  *.kate-swp
@@@ -14,3 -14,7 +14,7 @@@ youtube-dl.bash-completio
  youtube-dl
  youtube-dl.exe
  youtube-dl.tar.gz
+ .coverage
+ cover/
+ updates_key.pem
 -*.egg-info
++*.egg-info