# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1216004643 0
# Node ID 3ca9800a9be3f928f2edfa288e9b77c11c1ab57a
# Parent  d8e83a6a41277a38f09cad64298fc47b4bf775a7# Parent  af402fc34cb345e4346768c986b00dcfbeaf1c34
merge of '1a465eae5dc1b7bfc09b0724788403c096f461ce'
     and '532937221446ba2643f5101c22ae58abc83fa1be'

diff -r d8e83a6a4127 -r 3ca9800a9be3 COPYRIGHT
--- a/COPYRIGHT	Sun Jul 13 23:28:37 2008 +0000
+++ b/COPYRIGHT	Mon Jul 14 03:04:03 2008 +0000
@@ -8,7 +8,6 @@
 Dave Ahlswede
 Manuel Amador
 Matt Amato
-Elliott Sales de Andrade
 Geoffrey Antos
 Daniel Atallah
 Paul Aurich
@@ -230,6 +229,7 @@
 Wesley Lin
 Artem Litvinovich
 Josh Littlefield
+Daniel Ljungborg
 Syd Logan
 Lokheed
 Norberto Lopes
@@ -340,6 +340,7 @@
 Michael Ruprecht
 Sam S.
 Thanumalayan S.
+Elliott Sales de Andrade
 Tomasz Sałaciński <tsalacinski@gmail.com>
 Pradyumna Sampath
 Arvind Samptur
diff -r d8e83a6a4127 -r 3ca9800a9be3 ChangeLog
--- a/ChangeLog	Sun Jul 13 23:28:37 2008 +0000
+++ b/ChangeLog	Mon Jul 14 03:04:03 2008 +0000
@@ -12,7 +12,8 @@
 
 	MSN:
 	* Update MSN support to protocol 15 (Elliott Sales de Andrade, Jorge
-	  Villaseñor, Mike Ruprecht, Carlos Silva, Ma Yuan, Dimmuxx and others)
+	  Villaseñor, Mike Ruprecht, Carlos Silva, Ma Yuan, Daniel Ljungborg
+	  and others)
 	* Personal messages are now supported. They are treated as status
 	  messages.
 	* Offline IM is now supported.