pidgin/pidgin

Merge to default to fix conflicts

2016-10-24, Mike Ruprecht
6dc8cae57962
Merge to default to fix conflicts
/* This file is part of the Project Athena Zephyr Notification System.
* It contains source for the ZSetServerState function.
*
* Created by: Robert French
*
* Copyright (c) 1987 by the Massachusetts Institute of Technology.
* For copying and distribution information, see the file
* "mit-copyright.h".
*/
#include "internal.h"
Code_t ZSetServerState(state)
int state;
{
__Zephyr_server = state;
return (ZERR_NONE);
}