Merge "phpdoc File::makeTransformTmpFile can return null"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 4 Aug 2016 00:14:34 +0000 (00:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 4 Aug 2016 00:14:34 +0000 (00:14 +0000)

Trivial merge