From: Antoine Musso <hashar@free.fr>
Date: Fri, 4 May 2012 06:42:06 +0000 (+0200)
Subject: Credits/RN for bug 5445 / 7694faf68
X-Git-Tag: 1.31.0-rc.0~23736^2
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=8f315b3e2f5daffa23e96c35dc0ebdaaf412560b;p=lhc%2Fweb%2Fwiklou.git

Credits/RN for bug 5445 / 7694faf68

Change-Id: I41db0c0946bcef79a00d6d66e34114baaebe2ddc
---

diff --git a/CREDITS b/CREDITS
index bac73913e6..5b876f18a0 100644
--- a/CREDITS
+++ b/CREDITS
@@ -135,6 +135,7 @@ following names for their contribution to the product.
 * Manuel Menal
 * Marcin Cieślak
 * Marcus Buck
+* Mark A. Pelletier
 * Marooned
 * Mathias Ertl
 * Matthew Britton
diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index 1b35ad5c0f..6f412e5046 100644
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -47,6 +47,7 @@ production.
 * Edit notices can now be translated.
 * (bug 22887) Add warning and tracking category for preprocessor errors
 * (bug 31704) Allow selection of associated namespace on the watchlist
+* (bug 5445) Now remove autoblocks when a user is unblocked.
 
 === Bug fixes in 1.20 ===
 * (bug 30245) Use the correct way to construct a log page title.