Merge "Fix phpdoc of StatusValue::merge"

diff --git a/includes/libs/StatusValue.php b/includes/libs/StatusValue.php
index 3c2dd40..35de084 100644 (file)
--- a/includes/libs/StatusValue.php
+++ b/includes/libs/StatusValue.php
@@ -181,7 +181,7 @@ class StatusValue {
        /**
         * Merge another status object into this one
         *
-        * @param Status $other Other Status object
+        * @param StatusValue $other Other StatusValue object
         * @param bool $overwriteValue Whether to override the "value" member
         */
        public function merge( $other, $overwriteValue = false ) {