diff ChangeLog @ 28004:5479ffb6ec6c

merge of '89a4f914ccc668cb5ef2e9d16cf1652efb275071' and 'eb9385f349a20856b9d3f9911dbc8024caa44052'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Wed, 19 Aug 2009 00:56:19 +0000
parents 584e063285b7 901476dc70b9
children cc70e2bc4de5
line wrap: on
line diff
--- a/ChangeLog	Wed Aug 19 00:18:54 2009 +0000
+++ b/ChangeLog	Wed Aug 19 00:56:19 2009 +0000
@@ -1,5 +1,9 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.6.2 (??/??/2009):
+	XMPP:
+	* Prompt the user before cancelling a presence subscription.
+
 version 2.6.1 (08/18/2009):
 	* Fix a crash when some users send you a link in a Yahoo IM
 	* Fix compilation with GTK+ < 2.6.0