Merge branch 'gh-pages' of /home/phihag/projects/youtube-dl/. into gh-pages
Conflicts: download.html update/LATEST_VERSION update/versions.jsonpull/636/head
commit
680adff87b
Conflicts: download.html update/LATEST_VERSION update/versions.jsonpull/636/head