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

Conflicts:
	download.html
	update/LATEST_VERSION
	update/versions.json
This commit is contained in:
Philipp Hagemeister 2013-01-12 18:20:20 +01:00
commit 680adff87b

Diff content is not available