From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 28 Aug 2015 17:17:36 +0000 (+0000)
Subject: Merge "API: Add ApiResult::META_KVP_MERGE"
X-Git-Tag: 1.31.0-rc.0~10223
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=65d5f36ce5d2d31c23754a1757c4606099475888;p=lhc%2Fweb%2Fwiklou.git

Merge "API: Add ApiResult::META_KVP_MERGE"
---

65d5f36ce5d2d31c23754a1757c4606099475888