Merge branch 'gh-pages' of /home/phihag/projects/youtube-dl/. into gh-pages

Conflicts:
	download.html
	update/LATEST_VERSION
	update/versions.json
gh-pages-ytdl-org
Philipp Hagemeister 12 years ago
commit 680adff87b

Diff Content Not Available