pidgin/pidgin

pidgin/pidgin/libpurple/protocols/
Manual merge release-2.x.y branch into master.

2014-09-30, Mark Doliner
304d073d134e