Merge "Fix phpdoc of class vars in ResourceLoader"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 8 Mar 2014 05:31:13 +0000 (05:31 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 8 Mar 2014 05:31:13 +0000 (05:31 +0000)

Trivial merge