From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 17 Aug 2014 11:17:23 +0000 (+0200)
Subject: Merge branch 't/daemon_cleanups'
X-Git-Tag: v0.5.4~60
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=c1b282afb8e8422d12ae01a77937f27281748f1b;hp=c1b282afb8e8422d12ae01a77937f27281748f1b;p=paraslash.git

Merge branch 't/daemon_cleanups'

Cooking for two months.

	* daemon: Rename public functions.
	* Simplify set_server_start_time().

Conflicts:
	server.c
---