Merge "Use array_merge instead of the plus operator so that hooked functions are...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 27 Apr 2015 22:54:05 +0000 (22:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 27 Apr 2015 22:54:05 +0000 (22:54 +0000)

Trivial merge