]> Raphaël G. Git Repositories - youtubedl/commit
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)
commitc7b4d76a372777e3af76ecf9966a8ab9952e52f4
treefd14196a6c50bf079731ad90ae479268cfd486bf
parent1e9dbd83ef395035f4ec9be7b1d9ffefdd31484d
parent28d5370e4a3ed87a622c07b81844b14420e5bcba
Merge tag 'upstream/2013.05.14'

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

Conflicts:
.gitignore
.gitignore