Refs #4909 Only update the visitEcommerceStatus flag if it's not NONE.
This will prevent some occurrences of this bug, but not the case where visitEcommerceStatus == abandonedCart
Merge branch 'master' of github.com:piwik/piwik
Fixes #4878, use pre-piwik 2 data in VisitFrequency API if post-piwik 2 data cannot be found. Commit includes commented out tests for changes.
Refs #4909 Only update the visitEcommerceStatus flag if it's different from current value.
Merge remote-tracking branch 'origin/master'
Fix variable name in import_logs.py
Display output buffer if controller method returns output in FrontController::fetchDispatch.
Fix OmniFixture filtering.
Finish writing comment.
Make sure to log to screen in test environment, fix bug in distinct array merge function.
Remove ob_start()/ob_flush() calls in proxy index.php.
Define PIWIK_DOCUMENT_ROOT constant for tests.
Revert logging to screen during tests.
Add integration test for archive cron output text.
Fixing build.
Fix merge fail.
Fix build.
Fixing build.
make sure variable requestsbefore is defined
Merge pull request #248 from clearcode/fix_variable_name_in_import_logs

Fix variable name in import_logs.py
Thanks for the fix guys!