pidgin: 0cec42e5: merge of 'd09f79ede5d30c1f516d4af546eb9a...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 0cec42e59df0079f020b9ae2ca787bb8de3103c7
Parent:   d09f79ede5d30c1f516d4af546eb9a0f1d052593
Parent:   f6f1584f72ad1c5035410dc939f2251e873b5d54
Author:   markdoliner at pidgin.im
Date:     05/09/11 04:34:25
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0cec42e59df0079f020b9ae2ca787bb8de3103c7

Changelog: 

merge of 'd09f79ede5d30c1f516d4af546eb9a0f1d052593'
     and 'f6f1584f72ad1c5035410dc939f2251e873b5d54'

Changes against parent d09f79ede5d30c1f516d4af546eb9a0f1d052593

  patched  po/ChangeLog
  patched  po/nn.po

Changes against parent f6f1584f72ad1c5035410dc939f2251e873b5d54

  patched  libpurple/protocols/msn/directconn.c
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/p2p.c
  patched  libpurple/protocols/msn/p2p.h
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/msn/slpmsg.c
  patched  libpurple/protocols/msn/slpmsg.h
  patched  libpurple/protocols/msn/slpmsg_part.c
  patched  libpurple/protocols/msn/slpmsg_part.h