From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 9 Mar 2017 21:32:46 +0000 (+0000)
Subject: Merge "Allow fields to define their own merge strategy via callback."
X-Git-Tag: 1.31.0-rc.0~3830
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=e7e52af3e1f7bb26910442ac412a751e84c33ef1;p=lhc%2Fweb%2Fwiklou.git

Merge "Allow fields to define their own merge strategy via callback."
---

e7e52af3e1f7bb26910442ac412a751e84c33ef1