[youtube-dl/f19: 2/2] Merge branch 'master' into f19

[Christopher Meng]

commit 503e67a4351e4bb9bbd5b45fd0397236853b3676
Merge: 8010103 89f8aec
Author: Christopher Meng <rpm at cicku.me>
Date:   Fri Nov 15 09:59:13 2013 +0800

    Merge branch 'master' into f19

 .gitignore      |    1 +
 sources         |    2 +-
 youtube-dl.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---