From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 5 Nov 2010 17:32:25 +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=d0b0931b6a6fdc712f33d020223ced849f264595;p=ipfire-3.x.git

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

d0b0931b6a6fdc712f33d020223ced849f264595