From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 27 Feb 2009 13:22:11 +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=ca976021638b0c27d22781543d8472c00ef4101b;p=ipfire-3.x.git

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

ca976021638b0c27d22781543d8472c00ef4101b