Merge tag 'upstream/2014.11.21'

[youtubedl] / debian / manpages

diff --git a/debian/manpages b/debian/manpages
index cefa31fa8bc6299d66db8da3e5be74a116135152..c536488ca00b14e932a52e3e083c4b398ff22846 100644 (file)
--- a/debian/manpages
+++ b/debian/manpages
@@ -1 +1 @@
-debian/youtube-dl.1
+youtube-dl.1