pidgin: fa8d7756: merge of '60a632cb295df557713697e92727d5...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: fa8d775608740f34866d694c7d4fc3bd4ca23d7b
Parent:   60a632cb295df557713697e92727d551d7345451
Parent:   f0591ed5820261562bb9d8f49c75d08e3b334bfa
Author:   darkrain42 at pidgin.im
Date:     07/21/11 01:37:06
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fa8d775608740f34866d694c7d4fc3bd4ca23d7b

Changelog: 

merge of '60a632cb295df557713697e92727d551d7345451'
     and 'f0591ed5820261562bb9d8f49c75d08e3b334bfa'

Changes against parent 60a632cb295df557713697e92727d551d7345451

  patched  libpurple/prefs.c
  patched  libpurple/protocols/sametime/sametime.c

Changes against parent f0591ed5820261562bb9d8f49c75d08e3b334bfa

  patched  libpurple/plugins/log_reader.c