From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 17 Sep 2010 21:40:04 +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=7d57ed0c514bdec3182481914586715dcaacb13b;p=ipfire-3.x.git

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

7d57ed0c514bdec3182481914586715dcaacb13b