From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 30 Oct 2010 08:19:38 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=229c9d5addb287e46fc11bc59f9f64c12e293471;p=ipfire-3.x.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
---

229c9d5addb287e46fc11bc59f9f64c12e293471