pidgin: 372965a5: merge of '3a7408265d339b20bd3bef7b8fefc6...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 372965a59ea192151b9a13eb315299e292f77a3c
Parent:   3a7408265d339b20bd3bef7b8fefc62215ccf644
Parent:   3bdddc2619d93c794865a2e3ebf7f03a58929381
Author:   markdoliner at pidgin.im
Date:     08/22/11 12:18:10
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/372965a59ea192151b9a13eb315299e292f77a3c

Changelog: 

merge of '3a7408265d339b20bd3bef7b8fefc62215ccf644'
     and '3bdddc2619d93c794865a2e3ebf7f03a58929381'

Changes against parent 3a7408265d339b20bd3bef7b8fefc62215ccf644

  patched  po/POTFILES.in

Changes against parent 3bdddc2619d93c794865a2e3ebf7f03a58929381

  patched  libpurple/protocols/jabber/win32/posix.uname.c