Merge branch 'master' of https://github.com/jefftimesten/youtube-dl

diff --combined LATEST_VERSION
index 275de03d947758f5c9b002a6c63c1d4576dacd90,d070c6ea3d7655cfbbddea4fe127fc48fd5b9ecd..275de03d947758f5c9b002a6c63c1d4576dacd90
mode 100755,100644..100644
--- 1/LATEST_VERSION
--- 2/LATEST_VERSION
+++ b/LATEST_VERSION
@@@ -1,1 -1,1 +1,1 @@@
 -2012.10.09
 +9999.99.99

diff --combined README.md
index b3cd9a38cfdfb1eb51ca44e24a53568ff7fd5fae,4b0de1b8894d6871e4c32099fbfe3f7381856234..b3cd9a38cfdfb1eb51ca44e24a53568ff7fd5fae
mode 100755,100644..100644
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -30,7 -30,7 +30,7 @@@ which means you can modify it, redistri
      --list-extractors        List all supported extractors and the URLs they
                               would handle
  
 -  Video Selection:
 +## Video Selection:
      --playlist-start NUMBER  playlist video to start at (default is 1)
      --playlist-end NUMBER    playlist video to end at (default is last)
      --match-title REGEX      download only matching titles (regex or caseless
@@@ -39,7 -39,7 +39,7 @@@
                               caseless sub-string)
      --max-downloads NUMBER   Abort after downloading NUMBER files
  
 -  Filesystem Options:
 +## Filesystem Options:
      -t, --title              use title in file name
      --id                     use video ID in file name
      -l, --literal            [deprecated] alias of --title
@@@ -70,7 -70,7 +70,7 @@@
      --write-description      write video description to a .description file
      --write-info-json        write video metadata to a .info.json file
  
 -  Verbosity / Simulation Options:
 +## Verbosity / Simulation Options:
      -q, --quiet              activates quiet mode
      -s, --simulate           do not download the video and do not write anything
                               to disk
@@@ -85,7 -85,7 +85,7 @@@
      --console-title          display progress in console titlebar
      -v, --verbose            print various debugging information
  
 -  Video Format Options:
 +## Video Format Options:
      -f, --format FORMAT      video format code
      --all-formats            download all available video formats
      --prefer-free-formats    prefer free video formats unless a specific one is
@@@ -97,12 -97,12 +97,12 @@@
      --srt-lang LANG          language of the closed captions to download
                               (optional) use IETF language tags like 'en'
  
 -  Authentication Options:
 +## Authentication Options:
      -u, --username USERNAME  account username
      -p, --password PASSWORD  account password
      -n, --netrc              use .netrc authentication data
  
 -  Post-processing Options:
 +## Post-processing Options:
      -x, --extract-audio      convert video files to audio-only files (requires
                               ffmpeg or avconv and ffprobe or avprobe)
      --audio-format FORMAT    "best", "aac", "vorbis", "mp3", "m4a", or "wav";
@@@ -172,7 -172,7 +172,7 @@@ youtube requires an additional signatur
  The error
  
      File "youtube-dl", line 2
 -    SyntaxError: Non-ASCII character '\93' ...
 +    SyntaxError: Non-ASCII character '\x93' ...
  
  means you're using an outdated version of Python. Please update to Python 2.6 or 2.7.