wondering if this makes the ui tests work again?
Merge branch 'master' of github.com:piwik/piwik
use double slashes
removing it again, this did not fix the ui tests
Merge branch 'master' into manipulator_refactor
language update  refs #3430
submodule update
Merge pull request #5824 from piwik/translationupdates

[automatic translation update] Updated 84 strings in 7 languages (el, it, ja, nb, nl, sv, tr)
refs #5819 - added vp as param for search.yahoo.co.jp
refs #5819 - added k9safesearch.com
refs #5819 - added auone image search
added test
refs #5819 - added search.iminent.com as InfoSpace powered
refs #5819 - added www1.search-results.com
Fix parameter in deprecation message in /misc/cron/archive.php

Parameter passed to console should be --url=... instead of -- url=...
Fix merge conflict for b3ad4d8
Merge branch 'master' of https://github.com/piwik/piwik into fix/archive_message

Conflicts:
	misc/cron/archive.php
Remove removal of ExamplePlugin/API.php from old Update file.
Fixing UI tests build.
refs #5819 - added utorrent.inspsearch.com as InfoSpace powered