X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ChangeLog;h=092c2c668e302788d42d746d6ec9405dee3f9dde;hb=e471b5cc12c5c0eb40422df1e755123e534f0934;hp=58cd3aca1b4e96e9e24ab78cd5f4c643cc2ed2da;hpb=475427901039c9c14ff5bcae9458f937ce89108d;p=ircu2.10.12-pk.git

diff --git a/ChangeLog b/ChangeLog
index 58cd3ac..092c2c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-06  Michael Poole <mdpoole@troilus.org>
+
+	* ircd/gline.c (gline_add): If a forced G-line has already
+	expired, create it in a deactivated state.
+
+2010-01-06  Michael Poole <mdpoole@troilus.org>
+
+	* ircd/m_burst.c (ms_burst): Gracefully handle the case where a
+	server sends us a too-large oplevel.  Forward oplevels whenever
+	they are in use, not just when the channel is +A.
+
 2010-01-04  Kevin L. Mitchell  <klmitch@mit.edu>
 
 	* ircd/m_xquery.c (ms_xquery): Resolving my patches with