From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 31 Mar 2010 14:06:27 +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=be8c754c0720c3eca6bf02b6dedc1615d5738301;p=ipfire-3.x.git

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

be8c754c0720c3eca6bf02b6dedc1615d5738301