Merge "Fix phpdoc of StatusValue::merge"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 4 Dec 2015 21:05:22 +0000 (21:05 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 4 Dec 2015 21:05:22 +0000 (21:05 +0000)

Trivial merge