X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ChangeLog;h=972cefe2e9c9819bda83adb2a56f8dddec48be99;hb=2cf13869e6194d21a1f245aa251b33cb03b77bb6;hp=840e3dba42764a737961974ea2ed436030fce378;hpb=35fdd100a6c9e9ab362980d22e140ea18b793a6d;p=ircu2.10.12-pk.git

diff --git a/ChangeLog b/ChangeLog
index 840e3db..972cefe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-06-20  Michael Poole <mdpoole@troilus.org>
+
+	* ircd/ircd_string.c (ipmask_parse): Return zero if there is junk
+	after eight valid IPv6 address elements.
+
+2012-06-13  Michael Poole <mdpoole@troilus.org>
+
+	* ircd/s_stats.c (stats_configured_links): Correctly distinguish
+	local Operator blocks from global Operator blocks.
+
 2012-05-31  Michael Poole <mdpoole@troilus.org>
 
 	* ircd/m_gline.c (ms_gline): If the mask was empty after removing