Evan Prodromou b4da5f3785 Merge branch 'master' into 1.0.x ... Conflicts: plugins/Blacklist/BlacklistPlugin.php		2012-03-08 06:08:11 -06:00
..
locale	Localisation updates from http://translatewiki.net.	2012-03-01 17:22:45 +01:00
RegisterThrottlePlugin.php	Use X-Client header for IP for load-balancers	2012-01-10 10:51:36 -05:00
Registration_ip.php	Update translator documentation.	2011-06-05 19:46:45 +02:00