From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 18 Oct 2016 06:56:30 +0000 (+0000)
Subject: Merge "registration: Fix ignoring 'merge_strategy' key in manifest_version 2"
X-Git-Tag: 1.31.0-rc.0~5086
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=0489eedef3b806c20122fdce13b03fa0c895cb05;p=lhc%2Fweb%2Fwiklou.git

Merge "registration: Fix ignoring 'merge_strategy' key in manifest_version 2"
---

0489eedef3b806c20122fdce13b03fa0c895cb05