Jaime Marquínez Ferrándiz
9ee2b5f6f2
tests: don't run the test if any of the extractors listed in the 'add_ie' field is marked as not working
2013-11-06 16:43:26 +01:00
Ismaël Mejía
4ed3e51080
[ted] fixed error in case of no subtitles present
...
I created a test, but I leave it commented since TED videos get
new subtitles frequently.
2013-11-05 12:00:13 +01:00
Jaime Marquínez Ferrándiz
be97abc247
Set the 'extractor_key' field in the info_dict
...
It's the string returned by the class method 'ie_key', which allows to retrieve the extractor with 'get_info_extractor'
2013-11-03 12:14:44 +01:00
Jaime Marquínez Ferrándiz
9103bbc5cd
Add the 'webpage_url' field to info_dict
...
The url for the video page, it must allow to reproduce the result.
It's automatically set by YoutubeDL if it's missing.
2013-11-03 12:11:13 +01:00
Jaime Marquínez Ferrándiz
b6c45014ae
Set the extra_info inside YoutubeDL.process_ie_result and set only if the keys are missing
2013-11-03 11:57:04 +01:00
Ismaël Mejía
38fcd4597a
Merge remote-tracking branch 'iemejia/master'
2013-11-02 19:56:06 +01:00
Jaime Marquínez Ferrándiz
165e3bb67a
[bambuser] Add an extractor for channels ( closes #1702 )
2013-11-02 19:50:57 +01:00
Ismaël Mejía
38db46794f
Merge branch 'ted_subtitles'
2013-11-02 19:50:45 +01:00
Ismaël Mejía
a9a3876d55
[ted] Added support for subtitle download
2013-11-02 19:48:39 +01:00
Jaime Marquínez Ferrándiz
0ef7ad5cd4
Fix the test for dailymotion subtitles
...
The extractor returns a single info_dict now.
2013-10-31 07:55:03 +01:00
Filippo Valsorda
f6cc16f5d8
[tests] a HTTP 503 is a transient issue
2013-10-28 19:07:16 -04:00
Philipp Hagemeister
646e17a53d
Fix YouTubeDL test
2013-10-28 23:18:13 +01:00
Filippo Valsorda
dd508b7c4f
[tests] don't fail on network errors
...
This is suboptimal, but at least this way we will need to look at the logs
only to check for network errors that happen too often, instead of
parsing a ton of lines each time to see if there is some true test failing
2013-10-28 18:03:26 -04:00
Jaime Marquínez Ferrándiz
702665c085
tests: build the filename from the info_dict if the 'file' key is missing
...
It will need to have the 'id' and 'ext' keys to work.
2013-10-28 22:01:37 +01:00
Jaime Marquínez Ferrándiz
49e86983e7
Allow to use the extension for the format selection
...
The best format with the extension is downloaded.
2013-10-21 13:31:55 +02:00
Jaime Marquínez Ferrándiz
a9c58ad945
Accept requested formats to be in the format 35/best ( closes #1552 )
...
The format selection code is now an independent function.
2013-10-21 13:19:58 +02:00
Philipp Hagemeister
f4d96df0f1
Extend #980 with --max-quality support
2013-10-18 00:46:35 +02:00
Philipp Hagemeister
5d254f776a
Fix test
2013-10-18 00:27:51 +02:00
Philipp Hagemeister
1c1218fefc
Merge remote-tracking branch 'jaimeMF/format_selection'
2013-10-18 00:17:03 +02:00
Philipp Hagemeister
10eaae48ff
Merge branch 'master' of github.com:rg3/youtube-dl
2013-10-15 12:05:24 +02:00
Philipp Hagemeister
9d4660cab1
[generic] Support embedded vimeo videos ( #1602 )
2013-10-15 12:05:13 +02:00
Jaime Marquínez Ferrándiz
e772692ffd
Fix an import in the tests and the Youtube Shows test
2013-10-15 08:22:20 +02:00
Philipp Hagemeister
44a5f1718a
Simplify tests
...
* Make them directly executable again
* Move common stuff (md5, parameters) to helper
* Never import *
* General clean up
2013-10-15 02:00:55 +02:00
Jai Grimshaw
1fb07d10a3
[youtube] Adds #1312 Download annotations
...
Adds #1321 Download annotations from youtube
Annotations are downloaded and written to a .annotations.xml file using the https://www.youtube.com/annotations_invideo?features=1&legacy=1&video_id=$VIDEOID API.
Added unit test for annotations.
2013-10-14 16:22:27 +11:00
Jaime Marquínez Ferrándiz
d7e66d39a0
Add an extractor for internetvideoarchive.com videos
...
It's used by videodetective.com
2013-10-12 21:34:04 +02:00
Filippo Valsorda
d3f46b9aa5
Add support for single-test tox runs
...
Use a sintax like
tox test.test_download:TestDownload.test_NowVideo
to run the specific test on all the tox environments (Python versions)
2013-10-12 13:17:11 -04:00
Jaime Marquínez Ferrándiz
e028d0d1e3
Implement the prefer_free_formats in YoutubeDL
2013-10-11 16:34:49 +02:00
Jaime Marquínez Ferrándiz
91dbaef406
[nhl] Add an extractor for videocenter's categories ( #1586 )
...
It downloads the last 12 videos.
2013-10-11 14:33:26 +02:00
Philipp Hagemeister
b2ad967e45
Simplify test setup
2013-10-07 19:06:36 +02:00
Philipp Hagemeister
8dbe9899a9
Allow users to specify an age limit ( fixes #1545 )
...
With these changes, users can now restrict what videos are downloaded by the intented audience, by specifying their age with --age-limit YEARS .
Add rudimentary support in youtube, pornotube, and youporn.
2013-10-06 06:08:56 +02:00
Philipp Hagemeister
f4aac741d5
Move try_rm to test helpers
2013-10-06 05:47:17 +02:00
Filippo Valsorda
8932a66e49
[fixup] remove unnecessary commented function
2013-10-05 16:38:37 -04:00
Filippo Valsorda
00fcc17aee
add capability to suppress expected warnings in tests
2013-10-05 15:55:58 -04:00
Filippo Valsorda
7c61bd36bb
[youtube] correct --no-playlist for python3
2013-10-01 11:58:13 -04:00
Filippo Valsorda
d4d9920a26
add test for --no-playlist
2013-09-30 18:01:17 -04:00
Philipp Hagemeister
45f4a76dbc
Work around nosetests nosiness
2013-09-22 11:45:29 +02:00
Philipp Hagemeister
95dbd2f990
Change test target (Verified with node.js)
2013-09-21 15:10:38 +02:00
Philipp Hagemeister
e0df6211cc
Restore accidentally deleted commits
...
That's what happens if you let Windows machines write :(
2013-09-21 14:40:35 +02:00
Jaime Marquínez Ferrándiz
b00ca882a4
[livestream] Fix events extraction ( fixes #1467 )
2013-09-21 13:50:52 +02:00
Jaime Marquínez Ferrándiz
39baacc49f
[dailymotion] Add an extractor for users ( closes #1476 )
2013-09-21 12:45:53 +02:00
Jaime Marquínez Ferrándiz
e69ae5b9e7
[youtube] support youtube.googleapis.com/v/* urls ( fixes #1425 )
2013-09-15 12:14:59 +02:00
Jaime Marquínez Ferrándiz
92790f4e54
[soundcloud] Add an extractor for users ( closes #1426 )
2013-09-14 21:41:49 +02:00
Jaime Marquínez Ferrándiz
0b7f31184d
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
2013-09-14 11:14:40 +02:00
Jaime Marquínez Ferrándiz
a921f40799
[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
2013-09-13 22:05:29 +02:00
Jaime Marquínez Ferrándiz
74ac9bdd82
Merge pull request #1413 from tewe/master
...
Add Ustream channel support
2013-09-13 21:34:31 +02:00
Ismael Mejia
cf1dd0c59e
Merge branch 'master' into subtitles_rework
2013-09-11 14:26:48 +02:00
Jaime Marquínez Ferrándiz
8963d9c266
[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.
2013-09-09 10:33:12 +02:00
Ismael Mejia
72836fcee4
Merge branch 'master' into subtitles_rework
2013-09-06 23:24:41 +02:00
Ismael Mejia
d6e203b3dc
[subtitles] fixed multiple subtitles language separated by comma after merge
...
As mentioned in the pull request, I forgot to include this changes.
aa6a10c44a
2013-09-06 16:30:13 +02:00
Jaime Marquínez Ferrándiz
e3ea479087
[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.
2013-09-06 16:24:24 +02:00
Jaime Marquínez Ferrándiz
faab1d3836
[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)
2013-09-06 14:45:49 +02:00
Jaime Marquínez Ferrándiz
f4b052321b
[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.
2013-09-05 22:39:15 +02:00
Jaime Marquínez Ferrándiz
b7052e5087
Also print the field that fails if it is a md5 checksum
2013-08-29 12:15:45 +02:00
Jaime Marquínez Ferrándiz
aa6a10c44a
Allow to specify multiple subtitles languages separated by commas ( closes #518 )
2013-08-23 18:34:57 +02:00
Jaime Marquínez Ferrándiz
9e9c164052
Merge pull request #937 from jaimeMF/subtitles_rework
...
Subtitles rework
2013-08-23 02:40:25 -07:00
Ismael Mejia
18b4e04f1c
Merge branch 'master' into subtitles_rework
2013-08-22 23:29:36 +02:00
Philipp Hagemeister
d741e55a42
[youtube] Support watch_popup URLs ( Fixes #1275 )
2013-08-19 10:27:42 +02:00
Ismael Mejia
d80a064eff
[subtitles] Added tests to check correct behavior when no subtitles are
...
available
2013-08-08 22:22:33 +02:00
Ismael Mejia
447591e1ae
[test] Cleaned subtitles tests
2013-08-08 11:03:52 +02:00
Ismael Mejia
33eb0ce4c4
[subtitles] removed only-sub option (--skip-download achieves the same
...
functionality)
2013-08-08 10:06:24 +02:00
Philipp Hagemeister
e2f48f9643
Remove youtube sig tests
...
The signature algo changes too often for the static test to make sense.
2013-08-07 20:11:40 +02:00
Ismael Mejia
953e32b2c1
[dailymotion] Added support for subtitles + new InfoExtractor for
...
generic subtitle download.
The idea is that all subtitle downloaders must descend from SubtitlesIE
and implement only three basic methods to achieve the complete subtitle
download functionality. This will allow to reduce the code in YoutubeIE
once it is rewritten.
2013-08-07 18:59:11 +02:00
Jaime Marquínez Ferrándiz
04bca64bde
[youtube]: new algo for length 83 ( fixes #1164 )
2013-08-02 12:38:17 +02:00
Jaime Marquínez Ferrándiz
75952c6e3d
YoutubeIE: new algo for length 86 ( fixes #1156 )
...
Now is using the same length as the flash player used for age protected videos, but the algorithm is different, so now for age protected videos it first tries to use the old algo.
2013-07-31 10:45:13 +02:00
Jaime Marquínez Ferrándiz
caeefc29eb
[vimeo] add an extractor for channels
2013-07-29 13:12:09 +02:00
Jaime Marquínez Ferrándiz
a3c736def2
[dailymotion] Add an extractor for Dailymotion playlists
2013-07-29 12:07:38 +02:00
Jaime Marquínez Ferrándiz
5c468ca8a8
YoutubeIE: add algo for length 79 ( fixes #1126 )
2013-07-25 22:50:24 +02:00
Jaime Marquínez Ferrándiz
aedd6bb97d
YoutubeIE: new algo for length 81 ( fixes #1127 )
2013-07-25 22:06:53 +02:00
patrickslin
239e3e0cca
YoutubeIE: new algo for length 87 ( fixes #1105 )
...
Squashed commit from the pull requests #1107 , #1109 and #1110 .
2013-07-24 10:20:52 +02:00
Jaime Marquínez Ferrándiz
5d51a883c2
Use a dictionary for storing the subtitles
...
The errors while getting the subtitles are reported as warnings, if no subtitles are found return and empty dict.
2013-07-20 12:52:25 +02:00
Jaime Marquínez Ferrándiz
a4358cbabd
YoutubeIE: new algo for length 85 ( closes #1080 ), thanks to @patrickslin
2013-07-19 17:12:40 +02:00
Jaime Marquínez Ferrándiz
3e0b3a1428
Remove the test to signature of lengths 43,43
...
It's already covered by the test for length 87
2013-07-18 12:29:09 +02:00
Jaime Marquínez Ferrándiz
444b116597
YoutubeIE: add algo for length 90 ( closes #1064 )
...
Order the cases from higher to lower length.
2013-07-18 12:25:41 +02:00
Philipp Hagemeister
51fb64bab1
Mark test_youtube_sig as non-executable ( #1066 )
2013-07-17 11:04:07 +02:00
Philipp Hagemeister
2a5201638d
[youtube] Add sig test for 92 (Thanks to @patrickslin)
2013-07-17 09:23:38 +02:00
Jaime Marquínez Ferrándiz
606d7e67fd
YoutubeIE: add algo for length 81 ( closes #1026 )
2013-07-11 23:47:54 +02:00
Jaime Marquínez Ferrándiz
85347e1cb6
YoutubeIE: a new algo for length 83
2013-07-11 20:21:45 +02:00
Philipp Hagemeister
59ae56fad5
Add helper function find_path_attr
2013-07-11 16:12:08 +02:00
Jaime Marquínez Ferrándiz
c93898dae9
YoutubeIE: new algo for length 83 ( closes #1017 and closes #1016 )
2013-07-10 10:44:04 +02:00
Philipp Hagemeister
897f36d179
[youtube:subscriptions] Use colon for differentiation of shortcuts
2013-07-07 17:13:26 +02:00
Jaime Marquínez Ferrándiz
75dff0eef7
[youtube]: add YoutubeShowIE ( closes #14 )
...
It just extracts the playlists urls for each season
2013-07-01 17:59:28 +02:00
Jaime Marquínez Ferrándiz
bc2884afc1
Print which IE is being skipped in test_download
2013-06-28 11:20:00 +02:00
Jaime Marquínez Ferrándiz
023fa8c440
Add function add_default_info_extractors to YoutubeDL
...
It adds to the list the ies returned by ge_extractors
2013-06-27 23:51:06 +02:00
Philipp Hagemeister
a924876fed
Make sure that IEs only accept their own URLs
2013-06-27 21:25:51 +02:00
Philipp Hagemeister
fc2c063e1e
Move testcase generator to helper
2013-06-27 21:15:16 +02:00
Philipp Hagemeister
6f5ac90cf3
Move tests to the IE definitions
2013-06-27 20:46:46 +02:00
Philipp Hagemeister
0c56a3f773
[googleplus] move tests
2013-06-27 20:31:27 +02:00
Philipp Hagemeister
9d069c4778
[infoq] move tests
2013-06-27 20:27:08 +02:00
Philipp Hagemeister
67f51b3d8c
[youku] move tests
2013-06-27 20:25:46 +02:00
Philipp Hagemeister
5c5de1c79a
[eighttracks] move test
2013-06-27 20:22:00 +02:00
Philipp Hagemeister
0821771466
[steam] move test
2013-06-27 20:20:00 +02:00
Philipp Hagemeister
83f6f68e79
[metacafe] move tests
2013-06-27 20:18:35 +02:00
Philipp Hagemeister
0c6c096c20
[soundcloud] Move tests
2013-06-27 20:17:21 +02:00
Philipp Hagemeister
41beccbab0
Use str every time
2013-06-27 19:43:43 +02:00
Philipp Hagemeister
2eb88d953f
Allow _TESTS attribute for IEs with multiple tests
...
This also improves the numbering of duplicate tests
2013-06-27 19:13:11 +02:00
Philipp Hagemeister
6b47c7f24e
Allow moving tests into IE files
...
Allow adding download tests right in the IE file.
This will cut down on merge conflicts and make it more likely that new IE authors will add tests right away.
2013-06-27 18:28:45 +02:00
Philipp Hagemeister
ed4a915e08
Add tests and improve for HotNewHipHop
2013-06-27 17:56:48 +02:00
Filippo Valsorda
23300d7149
a new day, a new s algo - fix #946
2013-06-27 12:24:46 +02:00
Philipp Hagemeister
6b37f0be55
Add a clean-room implementation for youtube signatures
2013-06-27 01:51:10 +02:00
Philipp Hagemeister
5746f9da99
Add test for youtube signature algorithm
2013-06-27 00:09:25 +02:00
Philipp Hagemeister
112da0a0ce
Simplify FakeYDL
2013-06-27 00:09:05 +02:00
Philipp Hagemeister
ed92bc9f6e
[wimp] minor readability improvements ( #940 )
2013-06-26 18:22:42 +02:00
Jaime Marquínez Ferrándiz
aa0c87391c
Add CSpanIE ( closes #312 )
2013-06-26 17:55:54 +02:00
M.Yasoob Khalid
8bcc355972
removed trailing ',' and corrected the title in test
2013-06-26 15:51:25 +05:00
M.Yasoob Khalid
6b4642fae3
added test for wimp.com
2013-06-26 15:40:24 +05:00
Ismael Mejia
65cceef8f4
Added support for additional vtt subtitle format (WebVTT) in youtube-dl.
2013-06-26 11:28:47 +02:00
Jaime Marquínez Ferrándiz
b004821fa9
Add the option "--write-auto-sub" to download automatic subtitles from Youtube
...
Now automatic subtitles are only downloaded if the option is given.
(closes #903 )
2013-06-25 23:46:24 +02:00
M.Yasoob Khalid
f4daa18152
added test for tudou.com
2013-06-25 22:52:21 +05:00
Filippo Valsorda
f7ab6cbe16
add tests for use_cipher_signature videos ( #897 ) and the ability to test multiple videos per IE
2013-06-25 14:38:00 +02:00
Jaime Marquínez Ferrándiz
70d1924f8b
Add VevoIE
2013-06-24 12:31:41 +02:00
Jaime Marquínez Ferrándiz
8bf8b5a577
Use the new class in the tests
2013-06-24 10:21:44 +02:00
Jaime Marquínez Ferrándiz
8222d8de88
Split FileDownloader in two classes: FileDownloader and YoutubeDL
...
YoutubeDL is the class that coordinates everything
FileDownloader gets a filename and an info dict and downloads the video.
2013-06-24 10:21:43 +02:00
Philipp Hagemeister
825e0984e2
[break] adapt to new paths
2013-06-23 22:59:51 +02:00
Philipp Hagemeister
d1cade5ade
Correct module name
2013-06-23 22:53:42 +02:00
Philipp Hagemeister
0824c28c8b
Remove mentions of old InfoExtractors module
2013-06-23 22:42:59 +02:00
Philipp Hagemeister
b8a360837a
Fix Statigram test
2013-06-23 21:34:40 +02:00
Philipp Hagemeister
51ce3a75c9
Improve error reporting for downloads
2013-06-23 21:33:11 +02:00
M.Yasoob Khalid
9b5fffb149
added an IE and test for break.com
2013-06-23 22:42:51 +05:00
Philipp Hagemeister
828dba2983
Improvge error reporting
2013-06-23 18:59:01 +02:00
Philipp Hagemeister
6b3f5a329b
Improve Statigr.am IE
2013-06-23 18:58:53 +02:00
M.Yasoob Khalid
4fdd4e6f6f
added test for Statigr
2013-06-23 18:56:26 +05:00
Jaime Marquínez Ferrándiz
f4c8bbcfc2
TEDIE: download the best quality video and use the new _search_regex functions
...
Also extracts the description.
2013-06-20 20:51:20 +02:00
Jaime Marquínez Ferrándiz
377fdf5dde
Update the TumblrIE: the video is no longer available
2013-06-20 14:02:21 +02:00
Jaime Marquínez Ferrándiz
213b715893
Merge pull request #887 from anisse/master
...
Fetch all entries that are in a youtube playlist
Also add a test.
2013-06-19 12:52:44 +02:00
Filippo Valsorda
8bc7c3d858
Merge branch 'search_regex' - PR #872 - closes #847
2013-06-17 19:28:18 +02:00
Jaime Marquínez Ferrándiz
36ed7177f0
Fix HypemIE test: the song name has been changed
2013-06-16 20:42:28 +02:00
Jaime Marquínez Ferrándiz
32aa88bcae
Add GametrailersIE
2013-06-16 20:34:45 +02:00
Jaime Marquínez Ferrándiz
31513ea6b9
Update test_issue_673 in Youtube Lists
...
Some videos have been removed.
Delete the title check, it's not the purpose of that test.
2013-06-15 11:20:22 +02:00
Jaime Marquínez Ferrándiz
9abc6c8b31
Update YahooIE test
...
The old test video is no longer available.
2013-06-10 19:42:02 +02:00
Filippo Valsorda
ee55fcbe12
switch long info_dict fields checking to md5
2013-06-09 15:03:54 +02:00
Filippo Valsorda
78d3442b12
test: extend the reach of info_dict checking
...
* print the info_dict in a format suitable to easy adding to tests.json during tests if un-tested fields are detected
* make it possible to put the crc32 in tests.json if the field is too long
* complete the "info_dict" fields in existing tests
* fixed the bugs catched doing this
2013-06-09 14:21:42 +02:00
Filippo Valsorda
979a9dd4c4
_html_search_regex with clean_html superpowers
2013-06-09 11:57:13 +02:00
M.Yasoob Khalid
ecb3e676a5
Added Vbox7 Infoextractor
2013-06-08 12:44:38 +05:00
Filippo Valsorda
be95cac157
raise exceptions on warnings during tests - and solve a couple of them
2013-06-07 12:46:23 +02:00
Filippo Valsorda
476203d025
print WARNINGs during test + minor fix to NBAIE
2013-06-06 15:07:05 +02:00
M.Yasoob Khalid
157b864a01
added HypemIE
...
rebased, closes PR #871
2013-06-06 12:01:07 +02:00
Filippo Valsorda
951b9dfd94
Merge pull request #866 from yasoob/master
...
Added support for XHamster - closes #841
2013-06-04 10:39:31 -07:00
M.Yasoob Ullah Khalid
c978a96c02
Added test for XHamster.com
2013-06-04 17:33:02 +05:00
Clément DAVID
57bde0d9c7
Fix the test_all_urls (Import issue)
2013-06-04 13:10:12 +02:00
Clément DAVID
50b4d25980
Merge within test_all_urls
2013-06-04 13:06:49 +02:00
Clément DAVID
4a76d1dbe5
Add tests for justin.tv and twitch.tv
2013-06-03 22:16:55 +02:00
Jaime Marquínez Ferrándiz
dc1c355b72
YoutubeIE: fallback to automatic captions when subtitles aren't found ( closes #843 )
...
Also modify test_youtube_subtitles to support running the tests in any order.
2013-05-31 17:03:40 +02:00
Jaime Marquínez Ferrándiz
45014296be
Add TeamcocoIE ( closes #212 )
2013-05-21 14:37:32 +02:00
Anna Bernardi
afef36c950
add support for Flickr videos - closes #261
2013-05-20 23:19:38 +02:00
Jaime Marquínez Ferrándiz
17bd1b2f41
VineIE: extract more information and minor style changes
2013-05-20 08:31:03 +02:00
Anna Bernardi
5b0d3cc0cd
Add support for Vine - closes #845
2013-05-20 00:33:14 +02:00
Filippo Valsorda
d4f76f1674
Add support for Howcast.com - closes #835
2013-05-18 19:17:19 +02:00
Jaime Marquínez Ferrándiz
340fa21198
UstreamIE: get thumbnail and uploader name
2013-05-18 11:54:18 +02:00
Jaime Marquínez Ferrándiz
59f4fd4dc6
YahooIE: remove old code and accept screen.yahoo.com videos ( #300 )
...
Videos require rtmpdump
2013-05-12 14:05:14 +02:00
Philipp Hagemeister
86fd453ea8
Merge remote-tracking branch 'origin/master'
2013-05-10 09:21:24 +02:00