Merge remote-tracking branch 'origin/master' into dnt_maxthon

tests/PHPUnit/Unit/DeprecatedMethodsTest.php

@@ -22,7 +22,7 @@ class DeprecatedMethodsTest extends \PHPUnit_Framework_TestCase
 {
     public function test_version2_0_4()
     {
-        $validTill = '2014-11-25';
+        $validTill = '2014-02-25';
         $this->assertDeprecatedMethodIsRemoved('\Piwik\Period', 'factory', $validTill);
         $this->assertDeprecatedMethodIsRemoved('\Piwik\Config', 'getConfigSuperUserForBackwardCompatibility', $validTill);
         $this->assertDeprecatedMethodIsRemoved('\Piwik\Menu\MenuAdmin', 'addEntry', $validTill);
@@ -113,4 +113,4 @@ class DeprecatedMethodsTest extends \PHPUnit_Framework_TestCase
         $errorMessage = $className . '::' . $method . ' should be removed as the method is deprecated but it is not.';
         $this->assertFalse($methodExists, $errorMessage);
     }
-}
+}
\ No newline at end of file