# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1199723305 0
# Node ID 9bfdf68d185cf1b59b8e8c39dfbeab4bca34ea59
# Parent  21ed56853648a091e123df5f92c1db7cb202156a# Parent  31a631d08d46d3bfa56a30a2f651b494fe98dad2
merge of '5fc55e3a78ccb0a463df332592e62c5a371cd8b4'
     and 'ca3452eca310a510c6932f9a618b79da824d796a'

diff -r 21ed56853648 -r 9bfdf68d185c libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Mon Jan 07 15:52:50 2008 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Mon Jan 07 16:28:25 2008 +0000
@@ -7,6 +7,7 @@
  * Some code copyright (C) 2001-2007, Mark Doliner <thekingant@users.sourceforge.net>
  * Some code copyright (C) 2005, Jonathan Clark <ardentlygnarly@users.sourceforge.net>
  * Some code copyright (C) 2007, ComBOTS Product GmbH (htfv) <foss@combots.com>
+ * Some code copyright (C) 2008, Aman Gupta
  *
  * Most libfaim code copyright (C) 1998-2001 Adam Fritzler <afritz@auk.cx>
  * Some libfaim code copyright (C) 2001-2004 Mark Doliner <thekingant@users.sourceforge.net>