pidgin/pidgin

Merge to default to fix conflicts

2016-10-24, Mike Ruprecht
6dc8cae57962
Merge to default to fix conflicts
For information on writing a plugin for Purple, Pidgin or Finch, go
https://developer.pidgin.im and click on API. From there, see the
HOWTOs in the "Related Pages" section.
You can also generate this documentation locally by passing
"--enable-gtk-doc" to ./configure, then running "make" in the source tree.
The documentation will be in the doc/reference/*/html directories.