pidgin/pidgin

Manual merge for 07e827917960

2014-01-29, Tomasz Wasilczyk
056b8468d470
Manual merge for 07e827917960
For information on hacking on Pidgin, Finch, or libpurple, see:
https://developer.pidgin.im