Merge "Fix documentation of $wgProxyList"
authorSiebrand <siebrand@wikimedia.org>
Wed, 3 Oct 2012 15:04:36 +0000 (15:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 3 Oct 2012 15:04:36 +0000 (15:04 +0000)
commitb4d9ec4c3a62cf4b5c7fa48361a3d2fe459fb33a
treea5047ef02d33b82806d180f7020444fa692eb054
parentfec6387fc453fd045756bc992d5491107945bdfd
parent3a02e56bbe62a1648f8e96adf5595ef6f7d8c495
Merge "Fix documentation of $wgProxyList"
includes/DefaultSettings.php