From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 13 Dec 2014 22:05:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'fstirlitz/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=d5524947b560c1d0e1dfa2ef7f1969efe07866fa;hp=-c;p=youtube-dl

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

d5524947b560c1d0e1dfa2ef7f1969efe07866fa
diff --combined youtube_dl/extractor/comcarcoff.py
index a2211ee44,b62be56da..9c25b2223
--- a/youtube_dl/extractor/comcarcoff.py
+++ b/youtube_dl/extractor/comcarcoff.py
@@@ -1,6 -1,4 +1,6 @@@
  # encoding: utf-8
 +from __future__ import unicode_literals
 +
  import json
  
  from .common import InfoExtractor
@@@ -53,4 -51,5 +53,5 @@@ class ComCarCoffIE(InfoExtractor)
              'timestamp': parse_iso8601(video_data.get('pubDate')),
              'thumbnails': thumbnails,
              'formats': formats,
+             'webpage_url': 'http://comediansincarsgettingcoffee.com/%s' % (video_data.get('urlSlug', video_data.get('slug'))),
          }