pidgin: bdb9e04f: merge of '342a95ba56375edcb99f196a32acfd...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: bdb9e04ffa44988c3cb76672342070f9e798772a
Parent:   342a95ba56375edcb99f196a32acfdb530660c2a
Parent:   711a26934550db93abe9d01aa87be20ed8dfe6e8
Author:   qulogic at pidgin.im
Date:     01/09/11 20:17:34
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bdb9e04ffa44988c3cb76672342070f9e798772a

Changelog: 

merge of '342a95ba56375edcb99f196a32acfdb530660c2a'
     and '711a26934550db93abe9d01aa87be20ed8dfe6e8'

Changes against parent 342a95ba56375edcb99f196a32acfdb530660c2a

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

Changes against parent 711a26934550db93abe9d01aa87be20ed8dfe6e8

  patched  configure.ac
  patched  po/de.po