qulogic/pidgin

Merge
release-2.x.y
2014-03-24, Daniel Atallah
6c4d5b524296
Merge
For information on hacking on Pidgin, Finch, or libpurple, see:
http://developer.pidgin.im