pidgin: 90ad8eca: merge of '27d803c1a7d7bd1907e87fba4a7937...

Wed Mar 9 22:20:49 EST 2011

----------------------------------------------------------------------
Revision: 90ad8eca0d468e9f2a7fa150a3fe0f8e4db9abc4
Parent:   27d803c1a7d7bd1907e87fba4a7937a44389dd80
Parent:   ad6f772bb86f527497f77c40386497f461bcf3a5
Author:   qulogic at pidgin.im
Date:     03/09/11 22:18:45
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/90ad8eca0d468e9f2a7fa150a3fe0f8e4db9abc4

Changelog: 

merge of '27d803c1a7d7bd1907e87fba4a7937a44389dd80'
     and 'ad6f772bb86f527497f77c40386497f461bcf3a5'

Changes against parent 27d803c1a7d7bd1907e87fba4a7937a44389dd80

  patched  ChangeLog
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/oscar/flap_connection.c
  patched  libpurple/protocols/oscar/oscar.c

Changes against parent ad6f772bb86f527497f77c40386497f461bcf3a5

  patched  COPYRIGHT
  patched  configure.ac