pidgin: 1e0156a0: merge of '84c2ffd17fbd0e89d0c0c66d4a1ad0...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 1e0156a0321eeed4f351e9577ef964cde3343759
Parent:   84c2ffd17fbd0e89d0c0c66d4a1ad00571af6ba7
Parent:   8d08f95380f60d3049b38c0ee62fe93de1a3cf65
Author:   qulogic at pidgin.im
Date:     09/18/11 14:56:47
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1e0156a0321eeed4f351e9577ef964cde3343759

Changelog: 

merge of '84c2ffd17fbd0e89d0c0c66d4a1ad00571af6ba7'
     and '8d08f95380f60d3049b38c0ee62fe93de1a3cf65'

Changes against parent 84c2ffd17fbd0e89d0c0c66d4a1ad00571af6ba7

  patched  pidgin/gtkconv-theme.c

Changes against parent 8d08f95380f60d3049b38c0ee62fe93de1a3cf65

  patched  pidgin/plugins/gevolution/gevo-util.c