Merge "Add guard to Resources.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 18 Jan 2013 04:01:58 +0000 (04:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 18 Jan 2013 04:01:58 +0000 (04:01 +0000)

Trivial merge