From: Arne Fitzenreiter Date: Tue, 4 Nov 2014 19:12:50 +0000 (+0100) Subject: Merge branch 'seventeen' of git.ipfire.org:/pub/git/ipfire-2.x into seventeen X-Git-Tag: v2.17-core87~103^2~26^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3e7564c40d6228245c9cc570aa49940dfde778f;p=ipfire-2.x.git Merge branch 'seventeen' of git.ipfire.org:/pub/git/ipfire-2.x into seventeen --- b3e7564c40d6228245c9cc570aa49940dfde778f