From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 12 May 2010 15:28:20 +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=7c4d18f8d0423bb284ec00ea7aec7e95d838f9f3;p=ipfire-3.x.git

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

7c4d18f8d0423bb284ec00ea7aec7e95d838f9f3