From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 13 Apr 2009 19:00:43 +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=1de3fd7cee791c4b37980d489e00eb71461ac0a0;p=ipfire-3.x.git

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

1de3fd7cee791c4b37980d489e00eb71461ac0a0