From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 27 Nov 2010 15:57:11 +0000 (+0100)
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=f94c181673d47c7ec240957eeb795709ba783f69;p=ipfire-3.x.git

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

f94c181673d47c7ec240957eeb795709ba783f69