Merge "Use protocol default port with HTTP_X_FORWARDED_PROTO"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 3 Sep 2014 03:51:55 +0000 (03:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 3 Sep 2014 03:51:55 +0000 (03:51 +0000)

Trivial merge