pidgin/pidgin

Merge with a fair number of conflicts. Nothing too crazy.

2014-01-20, Mark Doliner
77664079d0f0
Merge with a fair number of conflicts. Nothing too crazy.

I didn't merge a lot of changes from 07e827917960
libpurple/protocols/gg/gg.c I think maybe that code has either been
removed or changed significantly in main.
/** @page gtkaccount-signals GtkAccount Signals
@signals
@signal account-modified
@endsignals
@see gtkaccount.h
<hr>
@signaldef account-modified
@signalproto
void (*account-modified)(PurpleAccount *account);
@endsignalproto
@signaldesc
Emitted when the settings for an account have been changed and saved.
@param account The account that has been modified.
@endsignaldef
*/
// vim: syntax=c.doxygen tw=75 et