Merge "Remove $wgHttpOnlyBlacklist"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 25 Mar 2014 13:13:34 +0000 (13:13 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 25 Mar 2014 13:13:34 +0000 (13:13 +0000)
1  2 
includes/DefaultSettings.php
includes/GlobalFunctions.php

Simple merge
Simple merge