1.1 --- a/ChangeLog
     1.2 +++ b/ChangeLog
     1.3 @@ -47,6 +47,14 @@
     1.4  	* The Offline Message Emulation plugin now adds a note that the message
     1.5  	  was an offline message. (Flavius Anton) (#2497)
     1.6  
     1.7 +	MSN:
     1.8 +	* Fix a crash when removing a user before its icon is loaded. (Mark
     1.9 +	  Barfield) (#15217)
    1.10 +
    1.11 +	Yahoo!:
    1.12 +	* Fix a double-free in profile/picture loading code. (Mihai Serban)
    1.13 +	  (#15053)
    1.14 +
    1.15  version 2.10.6 (07/06/2012):
    1.16  	Pidgin:
    1.17  	* Fix a bug that requires a triple-click to open a conversation

     2.1 --- a/doc/pidgin.1.in
     2.2 +++ b/doc/pidgin.1.in
     2.3 @@ -218,9 +218,7 @@
     2.4  .TP
     2.5  .B Notify buddies that you are typing to them
     2.6  Some protocols allow clients to tell their buddies when they are typing.
     2.7 -This option enables this feature for protocols that supports it.  For XMPP,
     2.8 -this also enables sending the "User has left the conversation" message
     2.9 -when ending the conversation.
    2.10 +This option enables this feature for protocols that supports it.
    2.11  
    2.12  .TP
    2.13  .B Default Formatting

     3.1 --- a/libpurple/protocols/yahoo/yahoo_picture.c
     3.2 +++ b/libpurple/protocols/yahoo/yahoo_picture.c
     3.3 @@ -137,9 +137,6 @@
     3.4  		if (url_data != NULL) {
     3.5  			yd = purple_connection_get_protocol_data(gc);
     3.6  			yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
     3.7 -		} else {
     3.8 -			g_free(data->who);
     3.9 -			g_free(data);
    3.10  		}
    3.11  	} else if (who && send_icon_info) {
    3.12  		yahoo_send_picture_info(gc, who);

     4.1 --- a/libpurple/protocols/yahoo/yahoo_profile.c
     4.2 +++ b/libpurple/protocols/yahoo/yahoo_profile.c
     4.3 @@ -1278,10 +1278,6 @@
     4.4  	url_data = purple_util_fetch_url(url, TRUE, NULL, FALSE, -1, yahoo_got_info, data);
     4.5  	if (url_data != NULL)
     4.6  		yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
     4.7 -	else {
     4.8 -		g_free(data->name);
     4.9 -		g_free(data);
    4.10 -	}
    4.11  
    4.12  	g_free(url);
    4.13  }

     5.1 --- a/po/de.po
     5.2 +++ b/po/de.po
     5.3 @@ -11,8 +11,8 @@
     5.4  msgstr ""
     5.5  "Project-Id-Version: de\n"
     5.6  "Report-Msgid-Bugs-To: \n"
     5.7 -"POT-Creation-Date: 2012-06-11 19:37+0200\n"
     5.8 -"PO-Revision-Date: 2012-06-11 19:36+0200\n"
     5.9 +"POT-Creation-Date: 2012-07-12 17:36+0200\n"
    5.10 +"PO-Revision-Date: 2012-07-12 17:36+0200\n"
    5.11  "Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n"
    5.12  "Language-Team: German <de@li.org>\n"
    5.13  "Language: de\n"
    5.14 @@ -11574,6 +11574,13 @@
    5.15  msgid "New Event"
    5.16  msgstr "Neue Ereignisse"
    5.17  
    5.18 +msgid ""
    5.19 +"The account has disconnected and you are no longer in this chat. You will "
    5.20 +"automatically rejoin the chat when the account reconnects."
    5.21 +msgstr ""
    5.22 +"Das Konto wurde getrennt und Sie sind nicht mehr in diesem Chat. Sie werden "
    5.23 +"den Chat automatisch wieder betreten, wenn das Konto wieder verbunden ist."
    5.24 +
    5.25  msgid "clear: Clears all conversation scrollbacks."
    5.26  msgstr "clear: Leert alle Gesprächsfenster."
    5.27  
    5.28 @@ -11865,6 +11872,9 @@
    5.29  msgid "Malay"
    5.30  msgstr "Malaiisch"
    5.31  
    5.32 +msgid "Burmese"
    5.33 +msgstr "Birmanisch"
    5.34 +
    5.35  msgid "Bokmål Norwegian"
    5.36  msgstr "Bokmål Norwegisch"
    5.37