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
blacklistadminpanel.php	Update translator documentation.	2011-04-06 15:36:03 +02:00
BlacklistPlugin.php	Fix grammar.	2012-02-27 15:56:35 +01:00
Homepage_blacklist.php	* i18n/L10n updates	2010-09-14 21:45:13 +02:00
Nickname_blacklist.php	* i18n/L10n updates	2010-09-14 21:45:13 +02:00