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

[Christopher Meng]

commit f173d244c9a03c9401452fbe41b9e633c8ccfbce
Merge: f1c0f2c a4a3049
Author: Christopher Meng <rpm at cicku.me>
Date:   Wed Jun 26 01:15:05 2013 +0800

    Merge branch 'master' into f18

 .gitignore      |    1 +
 sources         |    1 +
 youtube-dl.spec |    5 ++++-
 3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --cc .gitignore
index 6ad7c51,03af923..fc94494
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,7 +1,3 @@@
 -/youtube-dl-2012.10.09.tar.gz
 -/youtube-dl-2013.01.02.tar.gz
 -/youtube-dl-2013.01.13.tar.gz
 -/youtube-dl-2013.04.18.tar.gz
  /youtube-dl-2013.05.07.tar.gz
  /youtube-dl-2013.05.23.tar.gz
+ /youtube-dl-2013.06.31.tar.gz