Merge "Move libs/time/defines.php inclusion from GlobalFunctions to Defines.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 13 Jan 2017 01:26:35 +0000 (01:26 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 13 Jan 2017 01:26:35 +0000 (01:26 +0000)

Trivial merge