From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 31 May 2015 18:08:58 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.17-core91~30^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e97d4c98963477b5247005d33acd9d4b5fe1ca8e;p=ipfire-2.x.git

Merge branch 'master' into next

Conflicts:
	lfs/netsnmpd
---

e97d4c98963477b5247005d33acd9d4b5fe1ca8e