diff ChangeLog @ 30468:efb82b6b9406

merge of '36b528cbf13e606208f74b6ec90ce973f512df75' and '95bdb96951c9aaae802bf85e057270a6a37d2ca8'

--- a/ChangeLog	Tue Aug 31 02:52:28 2010 +0000
+++ b/ChangeLog	Tue Aug 31 02:57:59 2010 +0000
@@ -3,14 +3,20 @@
 version 2.7.4 (MM/DD/YYYY):
 	General:
 	* Fix search path for Tk when compiling on Debian Squeeze. (#12465)
-	
+
 	libpurple:
-	* Added ability to use TURN relaying via TCP and TLS (including preference
-	  settings for these).
+	* Added ability to use TURN relaying via TCP and TLS (as well as the
+	  preference settings for these).
+	* Fall back to an ordinary request if a UI does not support showing a
+	  request with an icon.  Fixes receiving MSN file transfer requests
+	  including a thumbnail in Finch.
 
 	Pidgin:
 	* Add support for the Gadu-Gadu protocol in the gevolution plugin to
 	  provide Evolution integration with contacts with GG IDs. (#10709)
+	* Remap the "Set User Mood" shortcut to Control-D, which does not
+	  conflict with the previous shortcut for Get Buddy Info on the
+	  selected buddy.
 
 	Finch:
 	* Add support for drop-down account options (like the SILC cipher