From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 16 Oct 2010 21:19:39 +0000 (+0200)
Subject: Merge branch 'next' into installer
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b50180cc6932c562a5da46d9a202c6ccce63efc1;p=ipfire-3.x.git

Merge branch 'next' into installer
---

b50180cc6932c562a5da46d9a202c6ccce63efc1