pidgin: 262d9672: merge of 'b8354dfc19eecdfd2aecfdb2685fbd...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 262d96720193c12bd137a8276fbe63a1280ac67c
Parent:   b8354dfc19eecdfd2aecfdb2685fbd78b9010587
Parent:   e406ff22b49f15b4ba4888f05f0e019b38575ea2
Author:   darkrain42 at pidgin.im
Date:     05/23/11 21:48:26
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/262d96720193c12bd137a8276fbe63a1280ac67c

Changelog: 

merge of 'b8354dfc19eecdfd2aecfdb2685fbd78b9010587'
     and 'e406ff22b49f15b4ba4888f05f0e019b38575ea2'

Changes against parent b8354dfc19eecdfd2aecfdb2685fbd78b9010587

  patched  libpurple/media/backend-fs2.c

Changes against parent e406ff22b49f15b4ba4888f05f0e019b38575ea2

  patched  libpurple/protocols/msn/nexus.c
  patched  libpurple/protocols/msn/nexus.h