From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 23 Nov 2014 20:33:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'jtwaleson/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=784b6d3a9bc79fe55a8b132fd10555c1e9a61c31

Merge remote-tracking branch 'jtwaleson/master'
---

784b6d3a9bc79fe55a8b132fd10555c1e9a61c31
diff --cc youtube_dl/extractor/youtube.py
index b4bbaf902,8711b06d4..45c85ed01
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@@ -1557,29 -1565,33 +1565,33 @@@ class YoutubeFeedsInfoExtractor(Youtube
              paging = mobj.group('paging')
          return self.playlist_result(feed_entries, playlist_title=self._PLAYLIST_TITLE)
  
+ 
  class YoutubeRecommendedIE(YoutubeFeedsInfoExtractor):
 -    IE_DESC = 'YouTube.com recommended videos, "ytrec" keyword (requires authentication)'
 +    IE_DESC = 'YouTube.com recommended videos, ":ytrec" for short (requires authentication)'
      _VALID_URL = r'https?://www\.youtube\.com/feed/recommended|:ytrec(?:ommended)?'
      _FEED_NAME = 'recommended'
      _PLAYLIST_TITLE = 'Youtube Recommended videos'
  
+ 
  class YoutubeWatchLaterIE(YoutubeFeedsInfoExtractor):
 -    IE_DESC = 'Youtube watch later list, "ytwatchlater" keyword (requires authentication)'
 +    IE_DESC = 'Youtube watch later list, ":ytwatchlater" for short (requires authentication)'
      _VALID_URL = r'https?://www\.youtube\.com/feed/watch_later|:ytwatchlater'
      _FEED_NAME = 'watch_later'
      _PLAYLIST_TITLE = 'Youtube Watch Later'
      _PERSONAL_FEED = True
  
+ 
  class YoutubeHistoryIE(YoutubeFeedsInfoExtractor):
 -    IE_DESC = 'Youtube watch history, "ythistory" keyword (requires authentication)'
 +    IE_DESC = 'Youtube watch history, ":ythistory" for short (requires authentication)'
      _VALID_URL = 'https?://www\.youtube\.com/feed/history|:ythistory'
      _FEED_NAME = 'history'
      _PERSONAL_FEED = True
      _PLAYLIST_TITLE = 'Youtube Watch History'
  
+ 
  class YoutubeFavouritesIE(YoutubeBaseInfoExtractor):
      IE_NAME = 'youtube:favorites'
 -    IE_DESC = 'YouTube.com favourite videos, "ytfav" keyword (requires authentication)'
 +    IE_DESC = 'YouTube.com favourite videos, ":ytfav" for short (requires authentication)'
      _VALID_URL = r'https?://www\.youtube\.com/my_favorites|:ytfav(?:ou?rites)?'
      _LOGIN_REQUIRED = True