Merged release-2.x.y into default

1 files changed, 19 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 776df3b8a8..4383dd0d4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -104,12 +104,22 @@ version 3.0.0 (??/??/????):
 	* A single jabber plugin provides XMPP, GTalk and Facebook protocols.
 	* A single yahoo plugin provides both Yahoo and Yahoo JAPAN protocols.
 
-version 2.12.1 (??/??/????):
+version 2.13.0 (??/??/????):
 	libpurple:
 	* Unified string comparison. (PR #186) (Arkadiy Illarionov)
+	* Properlly shell escape URI's when opening them. (PR #271 Daniel Kamil Kozar)
+
+	libgnt:
+	* Fixed build against curses 6.0 with opaque structs set. (#16764 dimstar)
+	  (PR #268 Daniel Kamil Kozar)
+	* Fixed a crash when resizing the window. (#16680 marcus) (PR #269 Daniel Kamil Kozar)
+
+	General:
+	* Fixed bashism in autotools. (#16836 lameventanas) (PR #267 Daniel Kamil Kozar)
 
 	XMPP:
 	* Show XEP-0066 OOB URLs in any message, not just headlines
+	* Fix a user after free (#17200 debarshiray) (PR #266 Ethan Blanton)
 
 	IRC:
 	* Fix "Registration timeout" on SASL auth with InspIRCd servers
@@ -117,6 +127,14 @@ version 2.12.1 (??/??/????):
 	* Fix issues with plugins that modify outgoing messages
 	  (such as the custom PART/QUIT feature of the IRC More plugin)
 
+	Pidgin:
+	* Better support for dark themes. (#12572 Alyssa Rosenzweig and Gary Kramlich)
+	* Fixed IPv6 links by not escaping []'s. (#16391 cyisfor) (PR #270 Daniel Kamil Kozar)
+	* Only write buddy icons to the cache if they're not already cached.  (PR #276 David Woodhouse)
+
+	Finch:
+	* Fix handling of search results (#17238 David Woodhouse)
+
 version 2.12.0 (03/09/2017):
 	libpurple:
 	* Fix an out of bounds memory write in purple_markup_unescape_entity.