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

[Christopher Meng]

commit 723fafb14ec11592daf26159bde8869d3f0e1ee4
Merge: 060001c 1672ab5
Author: Christopher Meng <rpm at cicku.me>
Date:   Tue Jul 16 10:21:08 2013 +0800

    Merge branch 'master' into f18

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