From: Andre Noll <maan@tuebingen.mpg.de>
Date: Thu, 22 Jan 2015 17:45:38 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v0.5.4~3
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=f167629b3191c57a6b691cd2a6af04a45a74ccb0;hp=f167629b3191c57a6b691cd2a6af04a45a74ccb0

Merge branch 'maint'

Was cooking for a week and seems to be regression-free.

	aft: Generate a remove event when adding duplicate files.
	command.c: Add missing items to EMPTY_STATUS_ITEMS.
	aft.c: Don't call osl_close_disk_object() on failure.
	Add missing osl() wrapper calls.
	fd.c: Add missing va_end().

The conflict in aft.c was trivial to fix up.
---