Merge changes Idfc2e2b6,I9b30d602
authorDemon <chadh@wikimedia.org>
Tue, 27 Nov 2012 17:18:21 +0000 (17:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 27 Nov 2012 17:18:21 +0000 (17:18 +0000)
* changes:
  $wgHTML5 is a different variable than $wgHtml5 and the right name is the later.
  Global tweaks wrt $wgSecureLogin.


Trivial merge