From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 5 May 2009 09:45:14 +0000 (+0200)
Subject: Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f55ac28c4de7c7e3970495d0b5c608cd91bb5a6e;p=ipfire-3.x.git

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

f55ac28c4de7c7e3970495d0b5c608cd91bb5a6e