From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 30 Dec 2013 12:55:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/next' into fifteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=349b93f67401d79548620da0bd9f695a36ae2823

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

Conflicts:
	config/rootfiles/core/70/exclude
	config/rootfiles/core/70/meta
	config/rootfiles/core/71/exclude
	config/rootfiles/core/71/meta
	config/rootfiles/core/72/filelists/strongswan
	config/rootfiles/core/72/meta
	config/rootfiles/core/73/exclude
	config/rootfiles/core/73/meta
	config/rootfiles/core/fifteen/exclude
	config/rootfiles/core/fifteen/filelists/strongswan
	config/rootfiles/core/fifteen/meta
	config/rootfiles/oldcore/70/exclude
	config/rootfiles/oldcore/70/meta
	config/rootfiles/oldcore/71/exclude
	config/rootfiles/oldcore/71/meta
	config/rootfiles/oldcore/72/filelists/strongswan
	config/rootfiles/oldcore/72/meta
	config/rootfiles/oldcore/73/exclude
	config/rootfiles/oldcore/73/filelists/GeoIP
	config/rootfiles/oldcore/73/filelists/hwdata
	config/rootfiles/oldcore/73/filelists/openssh
	config/rootfiles/oldcore/73/filelists/php
	config/rootfiles/oldcore/73/meta
---

349b93f67401d79548620da0bd9f695a36ae2823