Merge "Deprecate .php5 file extension"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 22 Apr 2015 20:03:58 +0000 (20:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 22 Apr 2015 20:03:58 +0000 (20:03 +0000)

Trivial merge