pidgin/pidgin

Merge heads of release-2.x.y branch. No overlapping files.
release-2.x.y
2014-11-04, Mark Doliner
5fdaf1c7c04f
Merge heads of release-2.x.y branch. No overlapping files.
For information on writing a plugin for Purple, Pidgin or Finch, go
http://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 installing
doxygen and graphviz dot, then running "make docs" in the
source tree. The documentation will be in the docs/html directory.