From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 9 Mar 2013 13:10:36 +0000 (+0100)
Subject: Merge branch 'core68' into next
X-Git-Tag: v2.13-core68~2^2~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=223fddd97a0f8c58322788f3e0fb6eb2eb7772cf;p=ipfire-2.x.git

Merge branch 'core68' into next

Conflicts:
	make.sh
---

223fddd97a0f8c58322788f3e0fb6eb2eb7772cf