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 savedstatus-signals Saved Status Signals
@signals
@signal savedstatus-changed
@endsignals
@see savedstatus.h
<hr>
@signaldef savedstatus-changed
@signalproto
void (*savedstatus_changed)(PurpleSavedStatus *new, PurpleSavedStatus *old);
@endsignalproto
@signaldesc
Emitted when a new saved status is activated.
@endsignaldef
*/
// vim: syntax=c.doxygen tw=75 et