From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 4 Dec 2015 21:05:22 +0000 (+0000)
Subject: Merge "Fix phpdoc of StatusValue::merge"
X-Git-Tag: 1.31.0-rc.0~8806
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=adb0c734befa5aff7362bbbc010785af40e543a2;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix phpdoc of StatusValue::merge"
---

adb0c734befa5aff7362bbbc010785af40e543a2