ChangeLog PR #276 and add David Woodhouse to the COPYRIGHT file

2 files changed, 2 insertions, 0 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index a8aff039e7..f08aff4c1c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -619,6 +619,7 @@ The Written Word, Inc.
 Kevin Wu Won
 Pui Lam Wong
 Justin Wood
+David Woodhouse
 Ximian
 Ma Xuan
 Yonas Yanfa
diff --git a/ChangeLog b/ChangeLog
index 55fcc742f3..974a4cb891 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@ version 2.12.1 (??/??/????):
 	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)