From: Arne Fitzenreiter Date: Thu, 27 Nov 2014 06:34:41 +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~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9156480159cd9661659df683967a964989dc9e70;p=ipfire-2.x.git Merge branch 'seventeen' of git.ipfire.org:/pub/git/ipfire-2.x into seventeen --- 9156480159cd9661659df683967a964989dc9e70