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

[Christopher Meng]

commit 805ff5fe32055b5b7f940f70f7117881b19c401e
Merge: eb45f05 50a07ff
Author: Christopher Meng <rpm at cicku.me>
Date:   Thu Dec 5 11:44:57 2013 +0800

    Merge branch 'master' into f19

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