]> Raphaël G. Git Repositories - youtubedl/commitdiff
Merge tag 'upstream/2013.05.14'
authorRogério Brito <rbrito@ime.usp.br>
Thu, 23 May 2013 00:00:29 +0000 (21:00 -0300)
committerRogério Brito <rbrito@ime.usp.br>
Thu, 23 May 2013 00:00:29 +0000 (21:00 -0300)
Upstream version 2013.05.14. We remove our own changes to avoid future
conflicts.

Conflicts:
.gitignore


No differences found