soc.2008.masterpassword: d9dcc23e: merge of '4172c8b556cbe96eb223559735bbaf...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: d9dcc23e32b3e7cd5e99381a5fa9a820920dfc8c
Parent:   4172c8b556cbe96eb223559735bbaf67126ba1cb
Parent:   7d31283df925d859d65a6b9291c98b404bc8ece4
Author:   qulogic at pidgin.im
Date:     11/19/11 18:58:01
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/d9dcc23e32b3e7cd5e99381a5fa9a820920dfc8c

Changelog: 

merge of '4172c8b556cbe96eb223559735bbaf67126ba1cb'
     and '7d31283df925d859d65a6b9291c98b404bc8ece4'

Changes against parent 4172c8b556cbe96eb223559735bbaf67126ba1cb

  patched  libpurple/plugins/keyrings/kwallet.cpp

Changes against parent 7d31283df925d859d65a6b9291c98b404bc8ece4

  patched  pidgin/gtkconv-theme.c
  patched  pidgin/gtkconv.c