Merge "Add support for HD versions of the wiki logo in MonoBook-like skins."

diff --combined includes/DefaultSettings.php
index 52c0eab,bc6db86..8a4769d
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -257,6 -257,23 +257,23 @@@ $wgFileCacheDirectory = false
   */
  $wgLogo = false;
  
+ /**
+  * Array with URL paths to HD versions of the wiki logo. The scaled logo size
+  * should be under 135x155 pixels.
+  * Only 1.5x and 2x versions are supported.
+  *
+  * @par Example:
+  * @code
+  * $wgLogoHD = array(
+  *    "1.5x" => "path/to/1.5x_version.png",
+  *    "2x" => "path/to/2x_version.png"
+  * );
+  * @endcode
+  *
+  * @since 1.25
+  */
+ $wgLogoHD = false;
+ 
  /**
   * The URL path of the shortcut icon.
   * @since 1.6
@@@ -7420,34 -7437,6 +7437,34 @@@ $wgPageLanguageUseDB = false
   */
  $wgUseLinkNamespaceDBFields = true;
  
 +/**
 + * Global configuration variable for Virtual REST Services.
 + * Parameters for different services are to be declared inside
 + * $wgVirtualRestConfig['modules'], which is to be treated as an associative
 + * array. Global parameters will be merged with service-specific ones. The
 + * result will then be passed to VirtualRESTService::__construct() in the
 + * module.
 + *
 + * Example config for Parsoid:
 + *
 + *   $wgVirtualRestConfig['modules']['parsoid'] = array(
 + *     'url' => 'http://localhost:8000',
 + *     'prefix' => 'enwiki',
 + *   );
 + *
 + * @var array
 + * @since 1.25
 + */
 +$wgVirtualRestConfig = array(
 +      'modules' => array(),
 +      'global' => array(
 +              # Timeout in seconds
 +              'timeout' => 360,
 +              'forwardCookies' => false,
 +              'HTTPProxy' => null
 +      )
 +);
 +
  /**
   * For really cool vim folding this needs to be at the end:
   * vim: foldmarker=@{,@} foldmethod=marker