# HG changeset patch
# User William Ehlhardt <williamehlhardt@gmail.com>
# Date 1180499875 0
# Node ID c8ee24d443c69c94012b773cfe44d857199dfc61
# Parent  f5de0f3c00343cc8ebff79e40cb9276f0530e7de# Parent  103a37dd9398bbd29158465eeec0bc0044c1eae5
merge of '158f2188a42dc47993ef8c4456fb084051cd485e'
     and '69f1848deb99093ace5393f554c3554be7f07735'

diff -r 103a37dd9398 -r c8ee24d443c6 ChangeLog
--- a/ChangeLog	Wed May 30 03:57:31 2007 +0000
+++ b/ChangeLog	Wed May 30 04:37:55 2007 +0000
@@ -5,6 +5,7 @@
 	* Moving an ICQ buddy from one group to another no longer
 	  re-requests authorization from that person (Rene Hausleitner)
 	* Added nullprpl, an example protocol plugin (Ryan Barrett)
+	* Fixed SOCKS5 bug which caused Jabber file receiving to fail
 
 	Finch:
 	* Auto account reconnecting