From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 18 Jan 2018 21:30:29 +0000 (+0000)
Subject: Merge "Fix phpdoc since $proto can be int"
X-Git-Tag: 1.31.0-rc.0~872
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=f0736cacdd846e31a7a95616949c298376e84c9b;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix phpdoc since $proto can be int"
---

f0736cacdd846e31a7a95616949c298376e84c9b