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

[Christopher Meng]

commit 81bb967d205424978173ca4fa19f6f6075ee9ec3
Merge: 8c3e341 a6a59ef
Author: Christopher Meng <rpm at cicku.me>
Date:   Tue May 14 12:17:28 2013 +0800

    Merge branch 'master' into f18

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