pidgin: 90634d4a: merge of 'a6a5be7291d88240cd7a6b7034ac99...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 90634d4a19f4639f388839e3efc46791f1ee31ab
Parent:   a6a5be7291d88240cd7a6b7034ac9942d5bfba4b
Parent:   f1f5a7e9b4ed4a9ffe523909a8a68b49928f2731
Author:   markdoliner at pidgin.im
Date:     03/31/12 17:29:04
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/90634d4a19f4639f388839e3efc46791f1ee31ab

Changelog: 

merge of 'a6a5be7291d88240cd7a6b7034ac9942d5bfba4b'
     and 'f1f5a7e9b4ed4a9ffe523909a8a68b49928f2731'

Changes against parent a6a5be7291d88240cd7a6b7034ac9942d5bfba4b

  patched  po/de.po

Changes against parent f1f5a7e9b4ed4a9ffe523909a8a68b49928f2731

  patched  COPYRIGHT
  patched  ChangeLog
  patched  libpurple/plugins/offlinemsg.c