youtube-dl
11 years agoUse self._download_webpage everywhere
Pierre Rudloff [Thu, 3 Oct 2013 23:12:42 +0000 (01:12 +0200)]
Use self._download_webpage everywhere

11 years agoUnused variable
Pierre Rudloff [Thu, 3 Oct 2013 23:07:24 +0000 (01:07 +0200)]
Unused variable

11 years agoChanges suggested by @phihag
Pierre Rudloff [Thu, 3 Oct 2013 23:04:38 +0000 (01:04 +0200)]
Changes suggested by @phihag

11 years agoImprovements
Pierre Rudloff [Tue, 17 Sep 2013 22:07:04 +0000 (00:07 +0200)]
Improvements

11 years agoMerge remote-tracking branch 'upstream/master' into websurg
Pierre Rudloff [Tue, 17 Sep 2013 21:07:44 +0000 (23:07 +0200)]
Merge remote-tracking branch 'upstream/master' into websurg

11 years agoExtractor for websurg.com
Pierre Rudloff [Tue, 17 Sep 2013 20:13:40 +0000 (22:13 +0200)]
Extractor for websurg.com

11 years ago[hotnewhiphop] Fix test case title
Jaime Marquínez Ferrándiz [Tue, 17 Sep 2013 19:10:57 +0000 (21:10 +0200)]
[hotnewhiphop] Fix test case title

11 years ago[youtube] Don't search the flash player version for videos with age gate activated
Jaime Marquínez Ferrándiz [Tue, 17 Sep 2013 18:59:55 +0000 (20:59 +0200)]
[youtube] Don't search the flash player version for videos with age gate activated

11 years agorelease 2013.09.17
Philipp Hagemeister [Tue, 17 Sep 2013 15:00:20 +0000 (17:00 +0200)]
release 2013.09.17

11 years agoUpdate 85 signature (Fixes #1449)
Philipp Hagemeister [Tue, 17 Sep 2013 14:59:12 +0000 (16:59 +0200)]
Update 85 signature (Fixes #1449)

This is the first signature algorithm to have been parsed automatically, although that only works for HTML5 players for now, and is not yet integrated into master.

11 years agoAdd an extractor for vice.com (closes #1051)
Jaime Marquínez Ferrándiz [Mon, 16 Sep 2013 18:58:36 +0000 (20:58 +0200)]
Add an extractor for vice.com (closes #1051)

11 years ago[ooyala] prefer ipad url
Jaime Marquínez Ferrándiz [Mon, 16 Sep 2013 18:16:52 +0000 (20:16 +0200)]
[ooyala] prefer ipad url

It has better quality with m3u8 manifests

11 years agoAdd an extractor for Bloomberg (closes #1436)
Jaime Marquínez Ferrándiz [Mon, 16 Sep 2013 17:39:39 +0000 (19:39 +0200)]
Add an extractor for Bloomberg (closes #1436)

11 years ago[ooyala] add support for more type of video urls, like m3u8 manifests.
Jaime Marquínez Ferrándiz [Mon, 16 Sep 2013 17:34:10 +0000 (19:34 +0200)]
[ooyala] add support for more type of video urls, like m3u8 manifests.

11 years agoAlways correct encoding when writing to sys.stderr (Fixes #1435)
Philipp Hagemeister [Mon, 16 Sep 2013 04:55:33 +0000 (06:55 +0200)]
Always correct encoding when writing to sys.stderr (Fixes #1435)

11 years agorelease 2013.09.16
Philipp Hagemeister [Mon, 16 Sep 2013 02:12:57 +0000 (04:12 +0200)]
release 2013.09.16

11 years ago[devscripts/release] temporary workarounds
Philipp Hagemeister [Mon, 16 Sep 2013 02:12:43 +0000 (04:12 +0200)]
[devscripts/release] temporary workarounds

11 years agoMerge remote-tracking branch 'origin/master'
Philipp Hagemeister [Mon, 16 Sep 2013 01:32:53 +0000 (03:32 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoStarts of a Windows service
Philipp Hagemeister [Mon, 16 Sep 2013 01:32:45 +0000 (03:32 +0200)]
Starts of a Windows service

11 years agoAdd an extractor for southparkstudios.com (closes #1434)
Jaime Marquínez Ferrándiz [Sun, 15 Sep 2013 21:30:58 +0000 (23:30 +0200)]
Add an extractor for southparkstudios.com (closes #1434)

It uses the MTV system

11 years agoMerge pull request #1422 from rzhxeo/xhamster
Jaime Marquínez Ferrándiz [Sun, 15 Sep 2013 10:16:37 +0000 (12:16 +0200)]
Merge pull request #1422 from rzhxeo/xhamster

XHamsterIE: Add support for new URL format (download in hd by default)

11 years ago[youtube] support youtube.googleapis.com/v/* urls (fixes #1425)
Jaime Marquínez Ferrándiz [Sun, 15 Sep 2013 10:14:59 +0000 (12:14 +0200)]
[youtube] support youtube.googleapis.com/v/* urls (fixes #1425)

11 years ago[soundcloud] Add an extractor for users (closes #1426)
Jaime Marquínez Ferrándiz [Sat, 14 Sep 2013 19:41:49 +0000 (21:41 +0200)]
[soundcloud] Add an extractor for users (closes #1426)

11 years agoSet the ext field for each format
Jaime Marquínez Ferrándiz [Sat, 14 Sep 2013 12:45:04 +0000 (14:45 +0200)]
Set the ext field for each format

11 years ago[mixcloud] Rewrite extractor (fixes #278)
Jaime Marquínez Ferrándiz [Sat, 14 Sep 2013 12:26:42 +0000 (14:26 +0200)]
[mixcloud] Rewrite extractor (fixes #278)

11 years agoNow --all-sub is a modifier to --write-sub and --write-auto-sub (closes #1412)
Jaime Marquínez Ferrándiz [Sat, 14 Sep 2013 09:14:40 +0000 (11:14 +0200)]
Now --all-sub is a modifier to --write-sub and --write-auto-sub (closes #1412)

For keeping backwards compatibility --all-sub sets --write-sub if --write-auto-sub is not given

11 years ago[googleplus] Fix upload date extraction
Jaime Marquínez Ferrándiz [Sat, 14 Sep 2013 09:10:01 +0000 (11:10 +0200)]
[googleplus] Fix upload date extraction

11 years agoXHamsterIE: Add support for new URL format
rzhxeo [Sat, 14 Sep 2013 03:42:00 +0000 (05:42 +0200)]
XHamsterIE: Add support for new URL format

11 years ago[ustream] Simplify channel extraction
Jaime Marquínez Ferrándiz [Fri, 13 Sep 2013 20:05:29 +0000 (22:05 +0200)]
[ustream] Simplify channel extraction

the ChannelParser has been moved to a new function in utils get_meta_content
Instead of the SocialStreamParser now it uses a regex

11 years agoMerge pull request #1413 from tewe/master
Jaime Marquínez Ferrándiz [Fri, 13 Sep 2013 17:55:49 +0000 (19:55 +0200)]
Merge pull request #1413 from tewe/master

Add Ustream channel support

11 years agoMerge pull request #1409 from JohnyMoSwag/master (closes #1404)
Jaime Marquínez Ferrándiz [Fri, 13 Sep 2013 17:41:15 +0000 (19:41 +0200)]
Merge pull request #1409 from JohnyMoSwag/master (closes #1404)

added kickstarter IE

11 years agoMerge pull request #1350 from Jaiz909/description-keyerror-fix
Jaime Marquínez Ferrándiz [Fri, 13 Sep 2013 16:20:09 +0000 (18:20 +0200)]
Merge pull request #1350 from Jaiz909/description-keyerror-fix

Fixed issue #1277 KeyError when no description.

11 years ago[buildserver] Service installation and uninstallation
Philipp Hagemeister [Fri, 13 Sep 2013 00:25:12 +0000 (02:25 +0200)]
[buildserver] Service installation and uninstallation

11 years ago[gamespot] Update test video title
Jaime Marquínez Ferrándiz [Thu, 12 Sep 2013 20:18:39 +0000 (22:18 +0200)]
[gamespot] Update test video title

11 years ago[youtube] update algo for length 82 (fixes #1416)
Jaime Marquínez Ferrándiz [Thu, 12 Sep 2013 20:04:09 +0000 (22:04 +0200)]
[youtube] update algo for length 82 (fixes #1416)

11 years ago[canalplust] accept urls that don't include the video id (fixes #1415), extract more...
Jaime Marquínez Ferrándiz [Thu, 12 Sep 2013 19:56:36 +0000 (21:56 +0200)]
[canalplust] accept urls that don't include the video id (fixes #1415), extract more info and update test

11 years ago[buildserver] Rely on repository license
Philipp Hagemeister [Thu, 12 Sep 2013 14:34:24 +0000 (16:34 +0200)]
[buildserver] Rely on repository license

11 years agoAdd original buildserver from @fraca7
Philipp Hagemeister [Thu, 12 Sep 2013 14:30:43 +0000 (16:30 +0200)]
Add original buildserver from @fraca7

11 years agoAdd Ustream channel support
tewe [Thu, 12 Sep 2013 10:30:14 +0000 (12:30 +0200)]
Add Ustream channel support

11 years ago[funnyordie] fix video url extraction
Jaime Marquínez Ferrándiz [Thu, 12 Sep 2013 09:31:27 +0000 (11:31 +0200)]
[funnyordie] fix video url extraction

11 years agorelease 2013.09.12
Philipp Hagemeister [Thu, 12 Sep 2013 09:26:44 +0000 (11:26 +0200)]
release 2013.09.12

11 years agoCheck for both automatic captions and subtitles with options `--write-sub` and `...
Jaime Marquínez Ferrándiz [Thu, 12 Sep 2013 09:15:25 +0000 (11:15 +0200)]
Check for both automatic captions and subtitles with options `--write-sub` and `--write-auto-sub` (fixes #1224)

11 years agoadded kickstarter IE
Johny Mo Swag [Wed, 11 Sep 2013 21:50:38 +0000 (14:50 -0700)]
added kickstarter IE

11 years ago[youtube] Fix detection of videos with automatic captions
Jaime Marquínez Ferrándiz [Wed, 11 Sep 2013 17:24:56 +0000 (19:24 +0200)]
[youtube] Fix detection of videos with automatic captions

11 years ago[subtitles] Also list the available automatic captions languages with '--list-sub'
Jaime Marquínez Ferrándiz [Wed, 11 Sep 2013 17:17:30 +0000 (19:17 +0200)]
[subtitles] Also list the available automatic captions languages with '--list-sub'

11 years ago[youtube] Support automatic captions with original language different from English...
Jaime Marquínez Ferrándiz [Wed, 11 Sep 2013 17:02:01 +0000 (19:02 +0200)]
[youtube] Support automatic captions with original language different from English (fixes #1225) and download in multiple languages.

11 years agoCredit @iemejia
Jaime Marquínez Ferrándiz [Wed, 11 Sep 2013 15:58:51 +0000 (17:58 +0200)]
Credit @iemejia

11 years agoMerge branch 'subtitles_rework' (closes PR #1326)
Jaime Marquínez Ferrándiz [Wed, 11 Sep 2013 15:37:57 +0000 (17:37 +0200)]
Merge branch 'subtitles_rework' (closes PR #1326)

11 years ago[howcast] Do not download from http://www.howcast.com/videos/{video_id}
Jaime Marquínez Ferrándiz [Wed, 11 Sep 2013 15:36:23 +0000 (17:36 +0200)]
[howcast] Do not download from howcast.com/videos/{video_id}

It takes too much to follow the redirection.

11 years ago[subtitles] Use self._download_webpage for extracting the subtitles
Jaime Marquínez Ferrándiz [Wed, 11 Sep 2013 14:24:47 +0000 (16:24 +0200)]
[subtitles] Use self._download_webpage for extracting the subtitles

It raises ExtractorError for the same exceptions we have to catch.

11 years ago[subtitles] Simplify the extraction of subtitles in subclasses and remove NoAutoSubti...
Jaime Marquínez Ferrándiz [Wed, 11 Sep 2013 14:05:49 +0000 (16:05 +0200)]
[subtitles] Simplify the extraction of subtitles in subclasses and remove NoAutoSubtitlesInfoExtractor

Subclasses just need to call the method extract_subtitles, which will call _extract_subtitles and _request_automatic_caption
Now the default implementation of _request_automatic_caption returns {}.

11 years ago[subtitles] rename SubitlesIE to SubtitlesInfoExtractor
Jaime Marquínez Ferrándiz [Wed, 11 Sep 2013 13:51:04 +0000 (15:51 +0200)]
[subtitles] rename SubitlesIE to SubtitlesInfoExtractor

Otherwise it can be automatically detected as a IE ready for use.

11 years ago[youtube] move subtitles methods from the base extractor to YoutubeIE
Jaime Marquínez Ferrándiz [Wed, 11 Sep 2013 13:48:23 +0000 (15:48 +0200)]
[youtube] move subtitles methods from the base extractor to YoutubeIE

11 years ago[subtitles] made inheritance hierarchy flat as requested
Ismael Mejia [Wed, 11 Sep 2013 13:21:09 +0000 (15:21 +0200)]
[subtitles] made inheritance hierarchy flat as requested

11 years agoMerge branch 'master' into subtitles_rework
Ismael Mejia [Wed, 11 Sep 2013 12:26:48 +0000 (14:26 +0200)]
Merge branch 'master' into subtitles_rework

11 years agoIn the supported sites page, sort the extractors in case insensitive
Jaime Marquínez Ferrándiz [Wed, 11 Sep 2013 10:04:27 +0000 (12:04 +0200)]
In the supported sites page, sort the extractors in case insensitive

11 years agorelease 2013.11.09
Philipp Hagemeister [Wed, 11 Sep 2013 09:30:10 +0000 (11:30 +0200)]
release 2013.11.09

11 years ago[youtube] update algo for length 85 (fixes #1408 and fixes #1406)
Jaime Marquínez Ferrándiz [Wed, 11 Sep 2013 09:24:58 +0000 (11:24 +0200)]
[youtube] update algo for length 85 (fixes #1408 and fixes #1406)

11 years ago[francetv] Add an extractor for francetvinfo.fr (closes #1317)
Jaime Marquínez Ferrándiz [Tue, 10 Sep 2013 13:50:34 +0000 (15:50 +0200)]
[francetv] Add an extractor for francetvinfo.fr (closes #1317)

It uses the same system as Pluzz, create a base class for both extractors.

11 years agoMerge pull request #1402 from Rudloff/canalc2
Philipp Hagemeister [Tue, 10 Sep 2013 10:19:37 +0000 (03:19 -0700)]
Merge pull request #1402 from Rudloff/canalc2

Wrong property name

11 years agoWrong property name
Pierre Rudloff [Tue, 10 Sep 2013 10:13:22 +0000 (12:13 +0200)]
Wrong property name

11 years agoAdd an extractor for pluzz.francetv.fr (closes PR #1399)
Pierre Rudloff [Sun, 8 Sep 2013 19:55:11 +0000 (21:55 +0200)]
Add an extractor for pluzz.francetv.fr (closes PR #1399)

11 years agorelease 2013.09.10
Philipp Hagemeister [Tue, 10 Sep 2013 09:25:11 +0000 (11:25 +0200)]
release 2013.09.10

11 years agoAdd an extractor for Slideshare (closes #1400)
Jaime Marquínez Ferrándiz [Tue, 10 Sep 2013 09:19:58 +0000 (11:19 +0200)]
Add an extractor for Slideshare (closes #1400)

11 years ago[sohu] add support for my.tv.sohu.com urls (fixes #1398)
Jaime Marquínez Ferrándiz [Mon, 9 Sep 2013 17:56:16 +0000 (19:56 +0200)]
[sohu] add support for my.tv.sohu.com urls (fixes #1398)

11 years agoFix the minutes part in FileDownloader.format_seconds (fixed #1397)
Jaime Marquínez Ferrándiz [Mon, 9 Sep 2013 08:38:54 +0000 (10:38 +0200)]
Fix the minutes part in FileDownloader.format_seconds (fixed #1397)

It printed for the minutes the result of (seconds // 60)

11 years ago[youtube] Modify the regex to match ids of length 11 (fixes #1396)
Jaime Marquínez Ferrándiz [Mon, 9 Sep 2013 08:33:12 +0000 (10:33 +0200)]
[youtube] Modify the regex to match ids of length 11 (fixes #1396)

In urls like http://www.youtube.com/watch?v=BaW_jenozKcsharePLED17F32AD9753930 you can't split the query string and ids always have that length.

11 years agoRevert "[youtube] Fix detection of tags from HLS videos."
Jaime Marquínez Ferrándiz [Sun, 8 Sep 2013 16:49:10 +0000 (18:49 +0200)]
Revert "[youtube] Fix detection of tags from HLS videos."

They have undo the change

This reverts commit 0638ad9999e7c374b253d0e13f4e3a20ef0b1171.

11 years agorelease 2013.09.07
Philipp Hagemeister [Sat, 7 Sep 2013 20:29:15 +0000 (22:29 +0200)]
release 2013.09.07

11 years agoMerge branch 'master' of github.com:rg3/youtube-dl
Philipp Hagemeister [Sat, 7 Sep 2013 20:28:54 +0000 (22:28 +0200)]
Merge branch 'master' of github.com:rg3/youtube-dl

11 years agoMerge branch 'master' into subtitles_rework
Ismael Mejia [Fri, 6 Sep 2013 21:23:23 +0000 (23:23 +0200)]
Merge branch 'master' into subtitles_rework

11 years ago[generic] If the url doesn't specify the protocol, then try to extract prepending...
Jaime Marquínez Ferrándiz [Fri, 6 Sep 2013 16:39:35 +0000 (18:39 +0200)]
[generic] If the url doesn't specify the protocol, then try to extract prepending ''

11 years ago[daylimotion] accept embed urls (fixes #1386)
Jaime Marquínez Ferrándiz [Fri, 6 Sep 2013 16:36:07 +0000 (18:36 +0200)]
[daylimotion] accept embed urls (fixes #1386)

11 years agoAdd an extractor for Metacritic
Jaime Marquínez Ferrándiz [Fri, 6 Sep 2013 16:08:07 +0000 (18:08 +0200)]
Add an extractor for Metacritic

11 years ago[subtitles] fixed multiple subtitles language separated by comma after merge
Ismael Mejia [Fri, 6 Sep 2013 14:26:22 +0000 (16:26 +0200)]
[subtitles] fixed multiple subtitles language separated by comma after merge

As mentioned in the pull request, I forgot to include this changes.
https://github.com/rg3/youtube-dl/commit/aa6a10c44a8e2e86f709c5301f9ea6ac3f01f002

11 years ago[youtube] Fix some issues with the detection of playlist/channel urls (reported in...
Jaime Marquínez Ferrándiz [Fri, 6 Sep 2013 14:24:24 +0000 (16:24 +0200)]
[youtube] Fix some issues with the detection of playlist/channel urls (reported in #1374)

They were being caught by YoutubeUserIE, now it only extracts a url if the rest of extractors aren't suitable.
Now the url tests check that the urls can only be extracted with an specific extractor.

11 years ago[youtube] Fix detection of feeds urls (fixes #1294)
Jaime Marquínez Ferrándiz [Fri, 6 Sep 2013 12:38:41 +0000 (14:38 +0200)]
[youtube] Fix detection of feeds urls (fixes #1294)

Urls like https://www.youtube.com/feed/watch_later were being as users (before the last changes to YoutubeUserIE, as videos)

11 years agoFix add-versions
Philipp Hagemeister [Fri, 6 Sep 2013 09:07:34 +0000 (11:07 +0200)]
Fix add-versions

11 years agorelease 2013.09.06.1
Philipp Hagemeister [Fri, 6 Sep 2013 08:53:35 +0000 (10:53 +0200)]
release 2013.09.06.1

11 years agoMerge remote-tracking branch 'origin/master'
Philipp Hagemeister [Fri, 6 Sep 2013 08:53:24 +0000 (10:53 +0200)]
Merge remote-tracking branch 'origin/master'

11 years agoDo not re-download files for hashsum generation (Fixes #1383)
Philipp Hagemeister [Fri, 6 Sep 2013 08:51:53 +0000 (10:51 +0200)]
Do not re-download files for hashsum generation (Fixes #1383)

11 years ago[youtube] Users: download from the api in json to simplify extraction (fixes #1358)
Jaime Marquínez Ferrándiz [Fri, 6 Sep 2013 08:41:46 +0000 (10:41 +0200)]
[youtube] Users: download from the api in json to simplify extraction (fixes #1358)

There could be duplicate videos or other videos if the description have links.

11 years ago[youtube] Fix detection of tags from HLS videos.
Jaime Marquínez Ferrándiz [Fri, 6 Sep 2013 08:25:31 +0000 (10:25 +0200)]
[youtube] Fix detection of tags from HLS videos.

11 years agorelease 2013.09.06
Philipp Hagemeister [Fri, 6 Sep 2013 08:13:33 +0000 (10:13 +0200)]
release 2013.09.06

11 years agoMerge pull request #1378 from patrickslin/patch-6
Jaime Marquínez Ferrándiz [Fri, 6 Sep 2013 07:49:50 +0000 (09:49 +0200)]
Merge pull request #1378 from patrickslin/patch-6

Vevo sig changed again, please update for us! Thanks very much! (fixes #...

11 years agoVevo sig changed again, please update for us! Thanks very much! (fixes #1375)
patrickslin [Fri, 6 Sep 2013 00:38:03 +0000 (17:38 -0700)]
Vevo sig changed again, please update for us! Thanks very much! (fixes #1375)

11 years ago[youtube] Urls like youtube.com/NASA are now interpreted as users (fixes #1069)
Jaime Marquínez Ferrándiz [Thu, 5 Sep 2013 20:38:23 +0000 (22:38 +0200)]
[youtube] Urls like youtube.com/NASA are now interpreted as users (fixes #1069)

Video urls like http://youtube.com/BaW_jenozKc are not valid, but http://youtu.be/BaW_jenozKc is correct.

11 years agorelease 2013.09.05
Philipp Hagemeister [Thu, 5 Sep 2013 20:30:50 +0000 (22:30 +0200)]
release 2013.09.05

11 years ago[youtube] Playlists: extract the videos id from ['media$group']['yt$videoid'] (fixes...
Jaime Marquínez Ferrándiz [Thu, 5 Sep 2013 19:40:04 +0000 (21:40 +0200)]
[youtube] Playlists: extract the videos id from ['media$group']['yt$videoid'] (fixes #1374)

'media$player' is not defined for private videos.

11 years ago[generic] Recognize html5 video in the format '<video src=".+?"' and only unquote...
Jaime Marquínez Ferrándiz [Thu, 5 Sep 2013 16:02:17 +0000 (18:02 +0200)]
[generic] Recognize html5 video in the format '<video src=".+?"' and only unquote the url when extracting the id (fixes #1372)

11 years agoAdd extractor for tvcast.naver.com (closes #1331)
Jaime Marquínez Ferrándiz [Thu, 5 Sep 2013 08:53:40 +0000 (10:53 +0200)]
Add extractor for tvcast.naver.com (closes #1331)

11 years ago[daum] Get the video page from a canonical url to extract the full id (fixes #1373...
Jaime Marquínez Ferrándiz [Thu, 5 Sep 2013 08:08:17 +0000 (10:08 +0200)]
[daum] Get the video page from a canonical url to extract the full id (fixes #1373) and extract description.

11 years agoCredit @Huarong for tv.sohu.com
Jaime Marquínez Ferrándiz [Wed, 4 Sep 2013 20:09:22 +0000 (22:09 +0200)]
Credit  @Huarong for tv.sohu.com

11 years agoAdd extractor for daum.net (closes #1330)
Jaime Marquínez Ferrándiz [Wed, 4 Sep 2013 20:06:50 +0000 (22:06 +0200)]
Add extractor for daum.net (closes #1330)

11 years agorelease 2013.09.04
Philipp Hagemeister [Wed, 4 Sep 2013 12:33:32 +0000 (14:33 +0200)]
release 2013.09.04

11 years agoMerge pull request #1341 from xanadu/master
Philipp Hagemeister [Wed, 4 Sep 2013 01:52:12 +0000 (18:52 -0700)]
Merge pull request #1341 from xanadu/master

add support for "-f mp4" for YouTube

11 years agoAHLS -> Apple HTTP Live Streaming
Allan Zhou [Wed, 4 Sep 2013 01:49:35 +0000 (18:49 -0700)]
AHLS -> Apple HTTP Live Streaming

11 years agoMerge pull request #1363 from Rudloff/defense
Philipp Hagemeister [Wed, 4 Sep 2013 01:23:08 +0000 (18:23 -0700)]
Merge pull request #1363 from Rudloff/defense

defense.gouv.fr

11 years agoMerge remote-tracking branch 'upstream/master'
Allan Zhou [Tue, 3 Sep 2013 19:22:29 +0000 (12:22 -0700)]
Merge remote-tracking branch 'upstream/master'

11 years agoSuggested by @phihag
Pierre Rudloff [Tue, 3 Sep 2013 10:03:19 +0000 (12:03 +0200)]
Suggested by @phihag