merge of 'f5746ce9d72d4c1b17b2601b7aae70644c3e5222'

Mon, 31 Aug 2009 20:07:36 +0000

author
Paul Aurich <darkrain42@pidgin.im>
date
Mon, 31 Aug 2009 20:07:36 +0000
changeset 28443
f5c49596f57f
parent 28439
f5746ce9d72d (current diff)
parent 28441
a0a2fbbb9dbc (diff)
child 28444
8eccffa3d7be

merge of 'f5746ce9d72d4c1b17b2601b7aae70644c3e5222'
and 'a0a2fbbb9dbca343dffee70e4d8e83c6adde170d'

--- a/ChangeLog	Mon Aug 31 20:06:36 2009 +0000
+++ b/ChangeLog	Mon Aug 31 20:07:36 2009 +0000
@@ -19,6 +19,11 @@
 	  the form "room@conference.example.net/User", where
 	  room@conference.example.net is a MUC.
 
+	Yahoo!/Yahoo! JAPAN:
+	* Accounts now have "Use account proxy for SSL connections" option.  This
+	  option force-overrides the account specific proxy settings for SSL
+	  connections only and instead uses the global proxy configuration.
+
 	Finch:
 	* Properly detect libpanel on OpenBSD.  (Brad Smith)
 	* Remove IO watches in gnt_quit.  (Tomasz Mon)

mercurial