From: Rogério Brito Date: Fri, 21 Jun 2013 00:13:34 +0000 (-0300) Subject: Merge tag 'upstream/2013.06.21' X-Git-Url: https://git.rapsys.eu/youtubedl/commitdiff_plain/b559da0987abed92b05a784938d25c722b86dc70?hp=b559da0987abed92b05a784938d25c722b86dc70 Merge tag 'upstream/2013.06.21' Upstream version 2013.06.21 Conflicts: .gitignore ---