From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 2 Apr 2016 08:43:43 +0000 (+0000)
Subject: Merge "Add prefered magic words first"
X-Git-Tag: 1.31.0-rc.0~7428
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=64c67cac1a8217418f1f5ce12963ce7ba0961970;p=lhc%2Fweb%2Fwiklou.git

Merge "Add prefered magic words first"
---

64c67cac1a8217418f1f5ce12963ce7ba0961970