From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 19 Mar 2009 15:28:56 +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=f08f5e4046dfdb055c92f38266d7866f6742831d;p=ipfire-3.x.git

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

f08f5e4046dfdb055c92f38266d7866f6742831d