# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1296783689 0
# Node ID c2c3200f48abfaa6caa73d2be97d67abf06b7f0b
# Parent  8a15b164ef30050418a3c10c7c3f6ef76347ccc5
Credit where due.

diff -r 8a15b164ef30 -r c2c3200f48ab COPYRIGHT
--- a/COPYRIGHT	Fri Feb 04 01:38:51 2011 +0000
+++ b/COPYRIGHT	Fri Feb 04 01:41:29 2011 +0000
@@ -281,6 +281,7 @@
 Joe LaPenna
 Steve Láposi
 Daniel Larsson
+Julia Lawall
 Peter Lawler
 Vadim Lebedev
 Ho-seok Lee
diff -r 8a15b164ef30 -r c2c3200f48ab ChangeLog
--- a/ChangeLog	Fri Feb 04 01:38:51 2011 +0000
+++ b/ChangeLog	Fri Feb 04 01:41:29 2011 +0000
@@ -32,6 +32,8 @@
 	  Samstag) (#13073)
 	* Fixed bugs in purple_str_to_time() that caused the most recent 'make
 	  check' failures.  (Nader Morshed) (#13131)
+	* Fix potential information disclosure issues in the Cipher code.  (Julia
+	  Lawall)
 
 	Pidgin:
 	* Support using the Page Up and Page Down keys on the numeric keypad in