From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 10 Mar 2009 15:19:19 +0000 (+0100)
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=bb38e3c1cbb7795f2f75936a3e813c99092211be;p=ipfire-3.x.git

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

bb38e3c1cbb7795f2f75936a3e813c99092211be