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

Conflicts:
	.gitignore
	LATEST_VERSION
	Makefile
	youtube-dl
	youtube-dl.exe
	youtube_dl/InfoExtractors.py
	youtube_dl/__init__.py

diff --cc LATEST_VERSION
index 0000000000000000000000000000000000000000,275de03d947758f5c9b002a6c63c1d4576dacd90..d070c6ea3d7655cfbbddea4fe127fc48fd5b9ecd
mode 000000,100644..100644
--- /dev/null
--- 2/LATEST_VERSION
+++ b/LATEST_VERSION
@@@ -1,0 -1,1 +1,1 @@@
 -9999.99.99
++2012.10.09

diff --cc README.md
index 0ac75f5d7f6905c59de466bf1ba46e5c549da3d0,b3cd9a38cfdfb1eb51ca44e24a53568ff7fd5fae..4b0de1b8894d6871e4c32099fbfe3f7381856234
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -34,19 -39,25 +39,25 @@@ which means you can modify it, redistri
                               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            use literal title in file name
+     -l, --literal            [deprecated] alias of --title
      -A, --auto-number        number downloaded files starting from 00000
-     -o, --output TEMPLATE    output filename template. Use %(stitle)s to get the
+     -o, --output TEMPLATE    output filename template. Use %(title)s to get the
                               title, %(uploader)s for the uploader name,
-                              %(autonumber)s to get an automatically incremented
-                              number, %(ext)s for the filename extension,
-                              %(upload_date)s for the upload date (YYYYMMDD),
-                              %(extractor)s for the provider (youtube, metacafe,
-                              etc), %(id)s for the video id and %% for a literal
-                              percent. Use - to output to stdout.
+                              %(uploader_id)s for the uploader nickname if
+                              different, %(autonumber)s to get an automatically
+                              incremented number, %(ext)s for the filename
+                              extension, %(upload_date)s for the upload date
+                              (YYYYMMDD), %(extractor)s for the provider
+                              (youtube, metacafe, etc), %(id)s for the video id
+                              and %% for a literal percent. Use - to output to
+                              stdout. Can also be used to download to a different
+                              directory, for example with -o '/my/downloads/%(upl
+                              oader)s/%(title)s-%(id)s.%(ext)s' .
+     --restrict-filenames     Restrict filenames to only ASCII characters, and
+                              avoid "&" and spaces in filenames
      -a, --batch-file FILE    file containing URLs to download ('-' for stdin)
      -w, --no-overwrites      do not overwrite files
      -c, --continue           resume partially downloaded files

diff --cc youtube-dl
index 0000000000000000000000000000000000000000,e6f05c17327ed58f8db66e6dc7d2a38380355d61..6ba864a14c87e41cc8c836754d5a8932ae8967a2
mode 000000,100755..100755
Binary files differ