From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 4 Mar 2015 22:58:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into next
X-Git-Tag: v2.17-core89~43
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=274ebe1d9d3390b94afe42e5b96273e171c3c6d3

Merge remote-tracking branch 'origin/master' into next

Conflicts:
	config/rootfiles/packages/clamav
	lfs/clamav
---

274ebe1d9d3390b94afe42e5b96273e171c3c6d3