Merge tag 'upstream/2013.05.14'

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

Conflicts:
	.gitignore

diff --cc .gitignore
index b13aa177d91b60eaa76d61d3a5cb6554eb9123ab,ca4e8f35321bea65b42197d82b63769a35944168..77469b8a7993a9b529769452f109e8805e8b1e50
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -14,3 -14,7 +14,7 @@@ youtube-dl.bash-completio
  youtube-dl
  youtube-dl.exe
  youtube-dl.tar.gz
 -*.egg-info
+ .coverage
+ cover/
+ updates_key.pem
++*.egg-info