pidgin/pidgin

Merge 2.x.y

2014-11-06, Tomasz Wasilczyk
09478bc2e043
Merge 2.x.y
For information on hacking on Pidgin, Finch, or libpurple, see:
https://developer.pidgin.im