Rapsys Git / youtubedl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d51f6f 523a0ad)
Merge tag 'upstream/2013.06.21'
authorRogério Brito <rbrito@ime.usp.br>
Fri, 21 Jun 2013 00:13:34 +0000 (21:13 -0300)
committerRogério Brito <rbrito@ime.usp.br>
Fri, 21 Jun 2013 00:13:34 +0000 (21:13 -0300)
Upstream version 2013.06.21

Conflicts:
.gitignore


Trivial merge
Backup clone of https://github.com/ytdl-org unavailable since RIAA fucking raid...