pidgin: 2efa9b7f: merge of 'bdb9e04ffa44988c3cb76672342070...

Sun Jan 9 22:35:47 EST 2011

----------------------------------------------------------------------
Revision: 2efa9b7fc41104668975df54e8be8a7171383794
Parent:   bdb9e04ffa44988c3cb76672342070f9e798772a
Parent:   e97fa87108d60ea0e2ce4aaeaee31e5967e0b6db
Author:   rekkanoryo at pidgin.im
Date:     01/09/11 22:30:05
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2efa9b7fc41104668975df54e8be8a7171383794

Changelog: 

merge of 'bdb9e04ffa44988c3cb76672342070f9e798772a'
     and 'e97fa87108d60ea0e2ce4aaeaee31e5967e0b6db'

Changes against parent bdb9e04ffa44988c3cb76672342070f9e798772a

  patched  COPYRIGHT
  patched  ChangeLog
  patched  libpurple/protocols/novell/novell.c

Changes against parent e97fa87108d60ea0e2ce4aaeaee31e5967e0b6db

  patched  libpurple/protocols/msn/error.c
  patched  libpurple/protocols/zephyr/zephyr.c