Merge "Add 'since <version>' to @deprecated annotations"

diff --cc includes/DefaultSettings.php
Simple merge

diff --cc includes/Namespace.php
Simple merge

diff --cc includes/db/ORMTable.php
Simple merge

diff --cc includes/site/MediaWikiSite.php
index 248066b,5f71b4f..2a86b31
--- 1/includes/site/MediaWikiSite.php
--- 2/includes/site/MediaWikiSite.php
+++ b/includes/site/MediaWikiSite.php
@@@ -39,9 -39,9 +39,9 @@@ class MediaWikiSite extends Site 
  
        /**
         * @since 1.21
-        * @deprecated Just use the constructor or the factory Site::newForType
+        * @deprecated since 1.21 Just use the constructor or the factory Site::newForType
         *
 -       * @param integer $globalId
 +       * @param int $globalId
         *
         * @return MediaWikiSite
         */