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)
commitc4d0ce485280223eda024cc52d37ee19ade02111
treec23e521c1e44fd07cd57fce6ac87a286e8da075c
parent9ce695420098e7d9af73726fb23db57e99f726b8
parent0473c33ecb20c4829dfabcadef0a988c1c16e3fb
Merge changes Idfc2e2b6,I9b30d602

* changes:
  $wgHTML5 is a different variable than $wgHtml5 and the right name is the later.
  Global tweaks wrt $wgSecureLogin.